From b37fd27a1598f4017d3a715fdc9728bcd09fc783 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 11 Apr 2008 00:28:15 +0000
Subject: [PATCH 001/111] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=9D=98=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=A4=91=20=EC=A0=9C=EB=AA=A9=EC=88=9C=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=EC=9D=B4=20documentModel=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=EB=8F=99=EC=9E=91=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
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@4097 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index cf027b951..14e9c2ed8 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -121,7 +121,7 @@
          **/
         function getDocumentList($obj, $except_notice = false) {
             // 정렬 대상과 순서 체크 
-            if(!in_array($obj->sort_index, array('list_order','regdate','last_update','update_order','readed_count','voted_count','comment_count','trackback_count','uploaded_count'))) $obj->sort_index = 'list_order'; 
+            if(!in_array($obj->sort_index, array('list_order','regdate','last_update','update_order','readed_count','voted_count','comment_count','trackback_count','uploaded_count','title'))) $obj->sort_index = 'list_order'; 
             if(!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc'; 
 
             // module_srl 대신 mid가 넘어왔을 경우는 직접 module_srl을 구해줌

From 4741a41952ba4039e2ab88a7b972d334cf0efde4 Mon Sep 17 00:00:00 2001
From: rubyeye <rubyeye@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 11 Apr 2008 02:32:36 +0000
Subject: [PATCH 002/111] =?UTF-8?q?./config/config.inc.php=EB=82=B4?=
 =?UTF-8?q?=EC=9D=98=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95.?=
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@4098 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 config/config.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.inc.php b/config/config.inc.php
index 1ec4db83d..46d960ff1 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -68,7 +68,7 @@
      *
      * php5 기반으로 바꾸게 되면 _autoload를 이용할 수 있기에 제거 대상
      **/
-    if(__DEBUG__) define('__ClassLosdStartTime__', getMicroTime());
+    if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
     require_once('./classes/object/Object.class.php');
     require_once('./classes/handler/Handler.class.php');
     require_once('./classes/xml/XmlParser.class.php');
@@ -82,7 +82,7 @@
     require_once('./classes/display/DisplayHandler.class.php');
     require_once('./classes/template/TemplateHandler.class.php');
     require_once('./classes/mail/Mail.class.php');
-    if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLosdStartTime__;
+    if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
 
     /**
      * @brief 세션 설정

From 71856d73131c883311bfd52b130e3169f62cc998 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 11 Apr 2008 02:37:08 +0000
Subject: [PATCH 003/111] =?UTF-8?q?rss=5Fwidget=EC=9D=98=20=EC=A0=9C?=
 =?UTF-8?q?=EB=AA=A9=20=EC=B6=9C=EB=A0=A5=EC=8B=9C=20htmlspecialchars?=
 =?UTF-8?q?=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=98=EC=97=AC=20html?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=EA=B0=80=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
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@4099 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/rss_reader/skins/sz_select/list.html   | 2 +-
 widgets/rss_reader/skins/sz_xe/list.html       | 2 +-
 widgets/rss_reader/skins/xe_official/list.html | 2 +-
 widgets/rss_reader/skins/xe_select/list.html   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/widgets/rss_reader/skins/sz_select/list.html b/widgets/rss_reader/skins/sz_select/list.html
index 258c467bc..2160a7e18 100644
--- a/widgets/rss_reader/skins/sz_select/list.html
+++ b/widgets/rss_reader/skins/sz_select/list.html
@@ -12,7 +12,7 @@
         {@$i=1}
         <select onchange="tab_menu_select({$tab_id}, {count($widget_info->rss_list)}, this.value, this);resize_rss_tabcontent('tab{$tab_id}',{$widget_info->rss_height})">
         <!--@foreach($widget_info->rss_list as $key => $item)-->
-        <option value="{$i}">{$item->title}</option>
+        <option value="{$i}">{htmlspecialchars($item->title)}</option>
         {@$i++}
         <!--@end-->
         </select>
diff --git a/widgets/rss_reader/skins/sz_xe/list.html b/widgets/rss_reader/skins/sz_xe/list.html
index a500f6a2b..0404d3b52 100644
--- a/widgets/rss_reader/skins/sz_xe/list.html
+++ b/widgets/rss_reader/skins/sz_xe/list.html
@@ -9,7 +9,7 @@
         <!--@foreach($widget_info->rss_list as $key => $item)-->
         <li title="{strip_tags($item->description)}">
             <span class="date">{$item->date}</span>
-            <span class="title"><a href="{$item->link}" onclick="window.open(this.href);return false">{$item->title}</a></span>
+            <span class="title"><a href="{$item->link}" onclick="window.open(this.href);return false">{htmlspecialchars($item->title)}</a></span>
         </li>
         <!--@end-->
     </ul>
diff --git a/widgets/rss_reader/skins/xe_official/list.html b/widgets/rss_reader/skins/xe_official/list.html
index f210cb3af..7b1236858 100644
--- a/widgets/rss_reader/skins/xe_official/list.html
+++ b/widgets/rss_reader/skins/xe_official/list.html
@@ -13,7 +13,7 @@
         <!--@foreach($widget_info->rss_list as $key => $item)-->
         <li>
           <span class="date">{$item->date}</span>
-          <span class="title"><a href="{$item->link}" onclick="window.open(this.href);return false">{$item->title}</a></span>
+          <span class="title"><a href="{$item->link}" onclick="window.open(this.href);return false">{htmlspecialchars($item->title)}</a></span>
         </li>
         <!--@end-->
     </ul>
diff --git a/widgets/rss_reader/skins/xe_select/list.html b/widgets/rss_reader/skins/xe_select/list.html
index 6935aec3a..78b1f5225 100644
--- a/widgets/rss_reader/skins/xe_select/list.html
+++ b/widgets/rss_reader/skins/xe_select/list.html
@@ -11,7 +11,7 @@
         {@$i=1}
         <select onchange="tab_menu_select({$tab_id}, {count($widget_info->rss_list)}, this.value, this);resize_rss_tabcontent('tab{$tab_id}',{$widget_info->rss_height})">
         <!--@foreach($widget_info->rss_list as $key => $item)-->
-        <option value="{$i}">{$item->title}</option>
+        <option value="{$i}">{htmlspecialchars($item->title)}</option>
         {@$i++}
         <!--@end-->
         </select>

From c2ea716a2b22d9b4b7d3429888734724b3673340 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 11 Apr 2008 05:25:00 +0000
Subject: [PATCH 004/111] =?UTF-8?q?=EB=AC=B8=EC=84=9C=EC=B6=94=EC=B6=9C?=
 =?UTF-8?q?=EC=8B=9C=20tag,=20comment=20=EA=B2=80=EC=83=89=EC=8B=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=90=98=EB=8A=94=20group=20by=EC=A0=88?=
 =?UTF-8?q?=EC=9D=98=20=ED=91=9C=EC=A4=80sql=EC=9D=84=20=EB=A7=9E=EC=B6=A4?=
 =?UTF-8?q?=20(order=EB=8C=80=EC=83=81=20=EC=BB=AC=EB=9F=BC=EC=9D=84=20sel?=
 =?UTF-8?q?ect=EC=97=90=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@4100 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/queries/getDocumentListWithinComment.xml | 1 +
 modules/document/queries/getDocumentListWithinTag.xml     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/document/queries/getDocumentListWithinComment.xml b/modules/document/queries/getDocumentListWithinComment.xml
index 23e00c77b..1c9d2b5ec 100644
--- a/modules/document/queries/getDocumentListWithinComment.xml
+++ b/modules/document/queries/getDocumentListWithinComment.xml
@@ -5,6 +5,7 @@
     </tables>
     <columns>
         <column name="documents.document_srl" />
+        <column name="comments.list_order" />
     </columns>
     <conditions>
         <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
diff --git a/modules/document/queries/getDocumentListWithinTag.xml b/modules/document/queries/getDocumentListWithinTag.xml
index 8e34b0a7b..23fb31bf3 100644
--- a/modules/document/queries/getDocumentListWithinTag.xml
+++ b/modules/document/queries/getDocumentListWithinTag.xml
@@ -5,6 +5,7 @@
     </tables>
     <columns>
         <column name="documents.document_srl" />
+        <column name="documents.list_order" />
     </columns>
     <conditions>
         <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />

From 314ab285961f2148dc9c2e59cec550b829c3160f Mon Sep 17 00:00:00 2001
From: clench <clench@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 11 Apr 2008 06:53:06 +0000
Subject: [PATCH 005/111] =?UTF-8?q?select=20=EB=90=A0=20=EC=BB=AC=EB=9F=BC?=
 =?UTF-8?q?=EB=AA=85=EC=9D=B4=20comments.list=5Forder=20=EC=9D=B8=EA=B2=83?=
 =?UTF-8?q?=EC=9D=84=20documents.list=5Forder=20=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
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@4101 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/queries/getDocumentListWithinComment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/document/queries/getDocumentListWithinComment.xml b/modules/document/queries/getDocumentListWithinComment.xml
index 1c9d2b5ec..3076c607e 100644
--- a/modules/document/queries/getDocumentListWithinComment.xml
+++ b/modules/document/queries/getDocumentListWithinComment.xml
@@ -5,7 +5,7 @@
     </tables>
     <columns>
         <column name="documents.document_srl" />
-        <column name="comments.list_order" />
+        <column name="documents.list_order" />
     </columns>
     <conditions>
         <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />

From 3ee143dd79e1923663844cf92cba62ee0c745f7a Mon Sep 17 00:00:00 2001
From: clench <clench@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 11 Apr 2008 06:55:13 +0000
Subject: [PATCH 006/111] =?UTF-8?q?group=20by=20=EC=97=90=20documents.list?=
 =?UTF-8?q?=5Forder=20=EB=B9=A0=EC=A7=84=EA=B2=83=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@4102 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/queries/getDocumentListWithinTag.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/document/queries/getDocumentListWithinTag.xml b/modules/document/queries/getDocumentListWithinTag.xml
index 23fb31bf3..771a6bcb4 100644
--- a/modules/document/queries/getDocumentListWithinTag.xml
+++ b/modules/document/queries/getDocumentListWithinTag.xml
@@ -21,5 +21,6 @@
     </navigation>
     <groups>
         <group column="documents.document_srl" />
+        <group column="documents.list_order" />
     </groups>
 </query>

From 21c3198beb6426b987380fd886c19b3d2cca2c08 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 11 Apr 2008 08:35:54 +0000
Subject: [PATCH 007/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4103
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 layouts/xe_blog/css/layout.css                      | 1 -
 modules/board/skins/xe_guestbook/view_document.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/layouts/xe_blog/css/layout.css b/layouts/xe_blog/css/layout.css
index 35aaa4cff..6f1c5ccf9 100644
--- a/layouts/xe_blog/css/layout.css
+++ b/layouts/xe_blog/css/layout.css
@@ -84,5 +84,4 @@ ul.blogMenu li a.on {}
 .widget_calendar td.posted a {text-decoration:underline;}
 .widget_calendar td.posted {text-decoration:underline;}
 
-
 .zbXE { width:960px; text-align:center; margin:20px auto 20px auto;}
diff --git a/modules/board/skins/xe_guestbook/view_document.html b/modules/board/skins/xe_guestbook/view_document.html
index ff8518884..4d507db47 100644
--- a/modules/board/skins/xe_guestbook/view_document.html
+++ b/modules/board/skins/xe_guestbook/view_document.html
@@ -62,7 +62,7 @@
 
         <div class="readBody">
             <div class="contentBody">
-                <a name="document_{$oDocument->document_srl}" />
+                <a name="document_{$oDocument->document_srl}"></a>
 
                 <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
                     <!--%import("filter/input_password.xml")-->

From 44e87213ca0d1a3fb7deb8fdfbb3d9f5a055743e Mon Sep 17 00:00:00 2001
From: k10206 <k10206@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Mon, 14 Apr 2008 05:15:33 +0000
Subject: [PATCH 008/111] =?UTF-8?q?DB=20=EC=BF=BC=EB=A6=AC=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=EB=A5=BC=20executeQueryArray=20=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD.?=
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@4104 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/rank_count/rank_count.class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/widgets/rank_count/rank_count.class.php b/widgets/rank_count/rank_count.class.php
index 9ebdce716..ee06ac83e 100644
--- a/widgets/rank_count/rank_count.class.php
+++ b/widgets/rank_count/rank_count.class.php
@@ -91,20 +91,20 @@
                     if(count($target_group_srl_list)) $obj->selected_group_srl = implode(',',$target_group_srl_list);
                     else $obj->selected_group_without_srl = implode(',',$target_group_without_srl_list);
                     
-                    if($rankby == "document") $output = executeQuery('widgets.rank_count.getRankDocumentCountWithinGroup', $obj);
-                    elseif($rankby == "comment") $output = executeQuery('widgets.rank_count.getRankCommentCountWithinGroup', $obj);
-                    elseif($rankby == "attach") $output = executeQuery('widgets.rank_count.getRankUploadedCountWithinGroup', $obj);
-                    elseif($rankby == "vote") $output = executeQuery('widgets.rank_count.getRankVotedCountWithinGroup', $obj);
-                    elseif($rankby == "read") $output = executeQuery('widgets.rank_count.getRankReadedCountWithinGroup', $obj);
+                    if($rankby == "document") $output = executeQueryArray('widgets.rank_count.getRankDocumentCountWithinGroup', $obj);
+                    elseif($rankby == "comment") $output = executeQueryArray('widgets.rank_count.getRankCommentCountWithinGroup', $obj);
+                    elseif($rankby == "attach") $output = executeQueryArray('widgets.rank_count.getRankUploadedCountWithinGroup', $obj);
+                    elseif($rankby == "vote") $output = executeQueryArray('widgets.rank_count.getRankVotedCountWithinGroup', $obj);
+                    elseif($rankby == "read") $output = executeQueryArray('widgets.rank_count.getRankReadedCountWithinGroup', $obj);
                 }
             }
             else {
                 //전체 목록을 구해옴
-                if($rankby == "document") $output = executeQuery('widgets.rank_count.getRankDocumentCount', $obj);
-                elseif($rankby == "comment") $output = executeQuery('widgets.rank_count.getRankCommentCount', $obj);
-                elseif($rankby == "attach") $output = executeQuery('widgets.rank_count.getRankUploadedCount', $obj);
-                elseif($rankby == "vote") $output = executeQuery('widgets.rank_count.getRankVotedCount', $obj);
-                elseif($rankby == "read") $output = executeQuery('widgets.rank_count.getRankReadedCount', $obj);
+                if($rankby == "document") $output = executeQueryArray('widgets.rank_count.getRankDocumentCount', $obj);
+                elseif($rankby == "comment") $output = executeQueryArray('widgets.rank_count.getRankCommentCount', $obj);
+                elseif($rankby == "attach") $output = executeQueryArray('widgets.rank_count.getRankUploadedCount', $obj);
+                elseif($rankby == "vote") $output = executeQueryArray('widgets.rank_count.getRankVotedCount', $obj);
+                elseif($rankby == "read") $output = executeQueryArray('widgets.rank_count.getRankReadedCount', $obj);
             }
 
             // 오류가 생기면 그냥 무시

From 33149a1ffb2fb18c930a129340d7ea6029ac8370 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 14 Apr 2008 12:00:54 +0000
Subject: [PATCH 009/111] =?UTF-8?q?#446=20'=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=9C=A0=EC=A7=80'=20=EC=B2=B4=ED=81=AC=ED=95=B4=EC=A0=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B2=BD=EA=B3=A0=EC=B0=BD=20=EC=B6=9C=EB=A0=A5?=
 =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
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@4105 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/skins/default/login_form.html         | 2 +-
 widgets/login_info/skins/default/login_form.html     | 2 +-
 widgets/login_info/skins/xe_official/login_form.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index 64d9511e4..37951b9a5 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -26,7 +26,7 @@
             <span class="button"><input type="submit" value="{$lang->cmd_login}" /></span>
 
             <p class="keep">
-                <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="return confirm(keep_signed_msg);"/>
+                <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
                 <label for="keepid">{$lang->keep_signed}</label>
             </p>
         </fieldset>
diff --git a/widgets/login_info/skins/default/login_form.html b/widgets/login_info/skins/default/login_form.html
index 9b8d4a082..0bcf8e655 100644
--- a/widgets/login_info/skins/default/login_form.html
+++ b/widgets/login_info/skins/default/login_form.html
@@ -25,7 +25,7 @@
 
       <div><input type="submit" value=" " class="submit" /></div>
       <ul class="option">
-        <li><input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="return confirm(keep_signed_msg);"/></li>
+        <li><input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/></li>
         <li><label for="keepid">{$lang->keep_signed}</label></li>
       </ul>
       <ul class="extra_option">
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index 12f751dbe..a468d364c 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -28,7 +28,7 @@
         <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
     </div>
     <p class="save">
-        <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="return confirm(keep_signed_msg);"/>
+        <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
         <label for="keepid">{$lang->keep_signed}</label>
 
 

From 44a4a7ba4a711d126e664b9a76a471460a695db8 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Tue, 15 Apr 2008 08:16:55 +0000
Subject: [PATCH 010/111] =?UTF-8?q?=EB=A1=9C=EA=B8=B4=20=EC=9C=A0=EC=A7=80?=
 =?UTF-8?q?=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B2=88=EC=97=AD,=20fileenco?=
 =?UTF-8?q?ding=20=EB=B3=80=EA=B2=BD=EB=90=9C=20=EA=B2=83=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
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@4106 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/en.lang.php | 412 ++++++++++++++++----------------
 1 file changed, 206 insertions(+), 206 deletions(-)

diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index 30a5d57b6..0680de2e3 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -1,206 +1,206 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author zero (zero@nzeo.com)
-     * @brief  English Language Pack (Only Basic Things)
-     **/
-
-    $lang->member = 'Member';
-    $lang->member_default_info = 'Basic Info';
-    $lang->member_extend_info = 'Additional Info';
-    $lang->default_group_1 = "Associate Member";
-    $lang->default_group_2 = "Regular Member";
-    $lang->admin_group = "Managing Group";
-    $lang->keep_signed = 'Keep me signed in';
-    $lang->remember_user_id = 'Save ID';
-    $lang->already_logged = "You are already logged on";
-    $lang->denied_user_id = 'You have entered a prohibited ID.';
-    $lang->null_user_id = 'Please input ID';
-    $lang->null_password = 'Please input password';
-    $lang->invalid_authorization = 'The account is not certificated.';
-    $lang->invalid_user_id= "You have entered an invalid ID";
-    $lang->invalid_password = 'You have entered an invalid password';
-    $lang->allow_mailing = 'Join Mailing';
-    $lang->allow_message = 'Receive Messages';
-    $lang->allow_message_type = array(
-             'Y' => 'Receive All',
-             'N' => 'Reject All',
-             'F' => 'Only Friends',
-        );
-    $lang->denied = 'Prohibited';
-    $lang->is_admin = 'Superadmin Permission';
-    $lang->group = 'Assigned Group';
-    $lang->group_title = 'Group Name';
-    $lang->group_srl = 'Group Number';
-    $lang->signature = 'Signature';
-    $lang->profile_image = 'Profile Image';
-    $lang->profile_image_max_width = 'Max Width';
-    $lang->profile_image_max_height = 'Max Height';
-    $lang->image_name = 'Image Name';
-    $lang->image_name_max_width = 'Max Width';
-    $lang->image_name_max_height = 'Max Height';
-    $lang->image_mark = 'Image Mark';
-    $lang->image_mark_max_width = 'Max Width';
-    $lang->image_mark_max_height = 'Max Height';
-	$lang->signature_max_height = 'Max Signature Height';
-    $lang->enable_openid = 'Enable OpenID';
-    $lang->enable_join = 'Allow Member Join';
-    $lang->limit_day = 'Temporary Limit Date';
-    $lang->limit_date = 'Limit Date';
-    $lang->after_login_url = 'URL after Login';
-    $lang->after_logout_url = 'URL after Logout';
-    $lang->redirect_url = 'URL after Join';
-    $lang->agreement = 'Member Join Agreement';
-    $lang->accept_agreement = 'Agree';
-    $lang->sender = 'Sender';
-    $lang->receiver = 'Receiver';
-    $lang->friend_group = 'Friend Group';
-    $lang->default_friend_group = 'Unassigned Group';
-    $lang->member_info = 'Member Info';
-    $lang->current_password = 'Current Password';
-    $lang->openid = 'OpenID';
-
-    $lang->webmaster_name = "Webmaster's Name";
-    $lang->webmaster_email = "Webmaster's Email";
-
-    $lang->about_keep_signed = '�������� �ݴ��� �α����� ��� ������ �� �ֽ��ϴ�.\n\n�α��� ���� ����� ����� ��� ���� ���Ӻ��ʹ� �α����� �Ͻ� �ʿ䰡 �����ϴ�.\n\n��, ���ӹ�, �б� �� ������ҿ��� �̿�� ���������� ����� �� ������ �� �α׾ƿ��� ���ּ���';
-	$lang->about_webmaster_name = "Please input webmaster's name which will be used for certification mails or other site administration. (default : webmaster)";
-    $lang->about_webmaster_email = "Please input webmaster's email address.";
-
-    $lang->search_target_list = array(
-        'user_id' => 'ID',
-        'user_name' => 'Name',
-        'nick_name' => 'Nickname',
-        'email_address' => 'Email Address',
-        'regdate' => 'Join Date',
-        'last_login' => 'Last Login Date',
-        'extra_vars' => 'Extra Vars',
-    );
-
-    $lang->message_box = array(
-        'R' => 'Received',
-        'S' => 'Sent',
-        'T' => 'Mailbox',
-    );
-
-    $lang->readed_date = "Read Date"; 
-
-    $lang->cmd_login = 'Login';
-    $lang->cmd_logout = 'Logout';
-    $lang->cmd_signup = 'Join';
-    $lang->cmd_modify_member_info = 'Modify Member Info';
-    $lang->cmd_modify_member_password = 'Modify Password';
-    $lang->cmd_view_member_info = 'Member Info';
-    $lang->cmd_leave = 'Leave';
-    $lang->cmd_find_member_account = 'Find Account Info';
-
-    $lang->cmd_member_list = 'Member List';
-    $lang->cmd_module_config = 'Default Setting';
-    $lang->cmd_member_group = 'Manage Groups';
-    $lang->cmd_send_mail = 'Send Mail';
-    $lang->cmd_manage_id = 'Manage Prohibited IDs';
-    $lang->cmd_manage_form = 'Manage Join Form';
-    $lang->cmd_view_own_document = 'Written Articles';
-    $lang->cmd_view_scrapped_document = 'Scraps';
-    $lang->cmd_view_saved_document = 'Saved Articles';
-    $lang->cmd_send_email = 'Send Mail';
-    $lang->cmd_send_message = 'Send Message';
-    $lang->cmd_reply_message = 'Reply Message';
-    $lang->cmd_view_friend = 'Friends';
-    $lang->cmd_add_friend = 'Add to Friends';
-    $lang->cmd_view_message_box = 'Message Box';
-    $lang->cmd_store = "Save";
-    $lang->cmd_add_friend_group = 'Add Friend Group';
-    $lang->cmd_rename_friend_group = 'Modify Friend Group Name';
-
-    $lang->msg_email_not_exists = "You have entered an invalid email address";
-
-    $lang->msg_alreay_scrapped = 'This article is already scrapped';
-
-    $lang->msg_cart_is_null = 'Please select the target';
-    $lang->msg_checked_file_is_deleted = '%d attached file(s) is(are) deleted';
-
-    $lang->msg_find_account_title = 'Account Info';
-    $lang->msg_find_account_info = 'This is requested account info.';
-    $lang->msg_find_account_comment = 'The password will be modified as above one as you click below link.<br />Please modify the password after login.';
-    $lang->msg_auth_mail_sended = 'The certification mail has been sent to %s. Please check your mail.';
-	$lang->msg_invalid_auth_key = 'This is an invalid request of certification.<br />Please retry finding account info or contact to administrator.';
-    $lang->msg_success_authed = 'Your account has been successfully certificated and logged on. Please modify the password to your own one with the password in the mail.';
-
-    $lang->msg_no_message = 'There is no message';
-    $lang->message_received = 'You have a new message';
-
-    $lang->msg_new_member = 'Add Member';
-    $lang->msg_update_member = 'Modify Member Info';
-    $lang->msg_leave_member = 'Leave';
-    $lang->msg_group_is_null = 'There is no registered group';
-    $lang->msg_not_delete_default = 'Default items cannot be deleted';
-    $lang->msg_not_exists_member = "Invalid member";
-    $lang->msg_cannot_delete_admin = 'Admin ID cannot be deleted. Please remove the ID from administration and try again.';
-    $lang->msg_exists_user_id = 'This ID already exists. Please try with another one.';
-    $lang->msg_exists_email_address = 'This email address already exists. Please try with another one.';
-    $lang->msg_exists_nick_name = 'This nickname already exists. Please try with another one.';
-    $lang->msg_signup_disabled = 'You are not able to sign up';
-    $lang->msg_already_logged = 'You have already signed up';
-    $lang->msg_not_logged = 'Please login first';
-    $lang->msg_title_is_null = 'Please input the title of message';
-    $lang->msg_content_is_null = 'Please input the content';
-    $lang->msg_allow_message_to_friend = "Failed to send because receiver only allows friends' messages";
-    $lang->msg_disallow_message = 'Failed to send because receiver rejects message reception';
-    $lang->msg_insert_group_name = 'Please input the name of group';
-    $lang->msg_check_group = 'Please select the group';
-
-    $lang->msg_not_uploaded_profile_image = 'Profile image could not be registered';
-    $lang->msg_not_uploaded_image_name = 'Image name could not be registered';
-    $lang->msg_not_uploaded_image_mark = 'Image mark could not be registered';
-
-    $lang->msg_accept_agreement = 'You have to agree the agreement'; 
-
-    $lang->msg_user_denied = 'You have entered a prohibited ID';
-    $lang->msg_user_limited = 'You have entered an ID that can be used after %s';
-
-    $lang->about_user_id = 'User ID should be 3~20 letters long and consist of alphabet+number with alphabet as first letter.';
-    $lang->about_password = 'Password should be 6~20 letters long';
-    $lang->about_user_name = 'Name should be 2~20 letters long';
-    $lang->about_nick_name = 'Nickname should be 2~20 letters long';
-    $lang->about_email_address = 'Email address will be used to modify/find password after email certification';
-    $lang->about_homepage = 'Please input if you have your websites';
-    $lang->about_blog_url = 'Please input if you have your blogs';
-    $lang->about_birthday = 'Please input your birth date';
-    $lang->about_allow_mailing = "If you don't join mailing, you will not able to receive group mail";
-    $lang->about_allow_message = 'You can decide message reception';
-    $lang->about_denied = 'Check to prohibit the ID';
-    $lang->about_is_admin = 'Check to give Superadmin permission';
-    $lang->about_description = "Administrator's memo about members";
-    $lang->about_group = 'An ID can belong to many groups';
-
-    $lang->about_column_type = 'Please set the format of additional sign up form';
-    $lang->about_column_name = 'Please input English name that can be used in template (name as variable)';
-    $lang->about_column_title = 'This will be displayed on sign up or modifying/viewing member info form';
-    $lang->about_default_value = 'You can set default values';
-    $lang->about_active = 'You have to check on active items to show on sign up form';
-    $lang->about_form_description = 'If you input in description form, it will be displayed on sign up form';
-    $lang->about_required = 'If you check, it will be essential item for sign up';
-
-    $lang->about_enable_openid = 'Allow users to sign up as OpenID';
-    $lang->about_enable_join = 'Allow users to sign up';
-    $lang->about_limit_day = 'You can limit certification date after sign up';
-    $lang->about_limit_date = 'User cannot login until assigned date';
-    $lang->about_after_login_url = 'You can set URL after login. Blank means current page.';
-    $lang->about_after_logout_url = 'You can set URL after logout. Blank means current page.';
-    $lang->about_redirect_url = 'Please input URL where users will go after sign up. When this is empty, it will be set as the previous page of sign up page.';
-    $lang->about_agreement = "Sign up agreement will only be displayed when it's not empty";
-
-    $lang->about_image_name = "Allow users to use image name instead of text name";
-    $lang->about_image_mark = "Allow users to use mark in front of their names";
-    $lang->about_profile_image = 'Allow users to use profile images';
-    $lang->about_accept_agreement = "I have read the agreement and agree"; 
-
-    $lang->about_member_default = 'It will be set as default group on sign up';
-
-    $lang->about_openid = 'When you join as OpenID, basic info like ID or email address will be saved on this site, process for password and certification management will be done on current OpenID offering service';
-    $lang->about_openid_leave = 'The secession of OpenID means deletion of your member info from this site.<br />If you login after secession, it will be recognized as a new member, so you will no longer have the permission for your ex-written articles.';
-
-    $lang->about_member = "This is a module for creating/modifying/deleting members and managing group or join form.\nYou can manage members by creating new groups, and get additional information by managing join form";
-    $lang->about_find_member_account = 'Your account info will be noticed by registered email address.<br />Please input email address which you have input on registration, and press "Find Account Info" button.<br />';
-?>
+<?php
+    /**
+     * @file   en.lang.php
+     * @author zero (zero@nzeo.com)
+     * @brief  English Language Pack (Only Basic Things)
+     **/
+
+    $lang->member = 'Member';
+    $lang->member_default_info = 'Basic Info';
+    $lang->member_extend_info = 'Additional Info';
+    $lang->default_group_1 = "Associate Member";
+    $lang->default_group_2 = "Regular Member";
+    $lang->admin_group = "Managing Group";
+    $lang->keep_signed = 'Keep me signed in';
+    $lang->remember_user_id = 'Save ID';
+    $lang->already_logged = "You are already logged on";
+    $lang->denied_user_id = 'You have entered a prohibited ID.';
+    $lang->null_user_id = 'Please input ID';
+    $lang->null_password = 'Please input password';
+    $lang->invalid_authorization = 'The account is not certificated.';
+    $lang->invalid_user_id= "You have entered an invalid ID";
+    $lang->invalid_password = 'You have entered an invalid password';
+    $lang->allow_mailing = 'Join Mailing';
+    $lang->allow_message = 'Receive Messages';
+    $lang->allow_message_type = array(
+             'Y' => 'Receive All',
+             'N' => 'Reject All',
+             'F' => 'Only Friends',
+        );
+    $lang->denied = 'Prohibited';
+    $lang->is_admin = 'Superadmin Permission';
+    $lang->group = 'Assigned Group';
+    $lang->group_title = 'Group Name';
+    $lang->group_srl = 'Group Number';
+    $lang->signature = 'Signature';
+    $lang->profile_image = 'Profile Image';
+    $lang->profile_image_max_width = 'Max Width';
+    $lang->profile_image_max_height = 'Max Height';
+    $lang->image_name = 'Image Name';
+    $lang->image_name_max_width = 'Max Width';
+    $lang->image_name_max_height = 'Max Height';
+    $lang->image_mark = 'Image Mark';
+    $lang->image_mark_max_width = 'Max Width';
+    $lang->image_mark_max_height = 'Max Height';
+	$lang->signature_max_height = 'Max Signature Height';
+    $lang->enable_openid = 'Enable OpenID';
+    $lang->enable_join = 'Allow Member Join';
+    $lang->limit_day = 'Temporary Limit Date';
+    $lang->limit_date = 'Limit Date';
+    $lang->after_login_url = 'URL after Login';
+    $lang->after_logout_url = 'URL after Logout';
+    $lang->redirect_url = 'URL after Join';
+    $lang->agreement = 'Member Join Agreement';
+    $lang->accept_agreement = 'Agree';
+    $lang->sender = 'Sender';
+    $lang->receiver = 'Receiver';
+    $lang->friend_group = 'Friend Group';
+    $lang->default_friend_group = 'Unassigned Group';
+    $lang->member_info = 'Member Info';
+    $lang->current_password = 'Current Password';
+    $lang->openid = 'OpenID';
+
+    $lang->webmaster_name = "Webmaster's Name";
+    $lang->webmaster_email = "Webmaster's Email";
+
+    $lang->about_keep_signed = 'Though the browser is closed, you might be kept signed.\n\nIf you use this feature at the shared computer, your personal information might be accessed by others, thus do not use this feature at the shared computer. ';
+    $lang->about_webmaster_name = "Please input webmaster's name which will be used for certification mails or other site administration. (default : webmaster)";
+    $lang->about_webmaster_email = "Please input webmaster's email address.";
+
+    $lang->search_target_list = array(
+        'user_id' => 'ID',
+        'user_name' => 'Name',
+        'nick_name' => 'Nickname',
+        'email_address' => 'Email Address',
+        'regdate' => 'Join Date',
+        'last_login' => 'Last Login Date',
+        'extra_vars' => 'Extra Vars',
+    );
+
+    $lang->message_box = array(
+        'R' => 'Received',
+        'S' => 'Sent',
+        'T' => 'Mailbox',
+    );
+
+    $lang->readed_date = "Read Date"; 
+
+    $lang->cmd_login = 'Login';
+    $lang->cmd_logout = 'Logout';
+    $lang->cmd_signup = 'Join';
+    $lang->cmd_modify_member_info = 'Modify Member Info';
+    $lang->cmd_modify_member_password = 'Modify Password';
+    $lang->cmd_view_member_info = 'Member Info';
+    $lang->cmd_leave = 'Leave';
+    $lang->cmd_find_member_account = 'Find Account Info';
+
+    $lang->cmd_member_list = 'Member List';
+    $lang->cmd_module_config = 'Default Setting';
+    $lang->cmd_member_group = 'Manage Groups';
+    $lang->cmd_send_mail = 'Send Mail';
+    $lang->cmd_manage_id = 'Manage Prohibited IDs';
+    $lang->cmd_manage_form = 'Manage Join Form';
+    $lang->cmd_view_own_document = 'Written Articles';
+    $lang->cmd_view_scrapped_document = 'Scraps';
+    $lang->cmd_view_saved_document = 'Saved Articles';
+    $lang->cmd_send_email = 'Send Mail';
+    $lang->cmd_send_message = 'Send Message';
+    $lang->cmd_reply_message = 'Reply Message';
+    $lang->cmd_view_friend = 'Friends';
+    $lang->cmd_add_friend = 'Add to Friends';
+    $lang->cmd_view_message_box = 'Message Box';
+    $lang->cmd_store = "Save";
+    $lang->cmd_add_friend_group = 'Add Friend Group';
+    $lang->cmd_rename_friend_group = 'Modify Friend Group Name';
+
+    $lang->msg_email_not_exists = "You have entered an invalid email address";
+
+    $lang->msg_alreay_scrapped = 'This article is already scrapped';
+
+    $lang->msg_cart_is_null = 'Please select the target';
+    $lang->msg_checked_file_is_deleted = '%d attached file(s) is(are) deleted';
+
+    $lang->msg_find_account_title = 'Account Info';
+    $lang->msg_find_account_info = 'This is requested account info.';
+    $lang->msg_find_account_comment = 'The password will be modified as above one as you click below link.<br />Please modify the password after login.';
+    $lang->msg_auth_mail_sended = 'The certification mail has been sent to %s. Please check your mail.';
+	$lang->msg_invalid_auth_key = 'This is an invalid request of certification.<br />Please retry finding account info or contact to administrator.';
+    $lang->msg_success_authed = 'Your account has been successfully certificated and logged on. Please modify the password to your own one with the password in the mail.';
+
+    $lang->msg_no_message = 'There is no message';
+    $lang->message_received = 'You have a new message';
+
+    $lang->msg_new_member = 'Add Member';
+    $lang->msg_update_member = 'Modify Member Info';
+    $lang->msg_leave_member = 'Leave';
+    $lang->msg_group_is_null = 'There is no registered group';
+    $lang->msg_not_delete_default = 'Default items cannot be deleted';
+    $lang->msg_not_exists_member = "Invalid member";
+    $lang->msg_cannot_delete_admin = 'Admin ID cannot be deleted. Please remove the ID from administration and try again.';
+    $lang->msg_exists_user_id = 'This ID already exists. Please try with another one.';
+    $lang->msg_exists_email_address = 'This email address already exists. Please try with another one.';
+    $lang->msg_exists_nick_name = 'This nickname already exists. Please try with another one.';
+    $lang->msg_signup_disabled = 'You are not able to sign up';
+    $lang->msg_already_logged = 'You have already signed up';
+    $lang->msg_not_logged = 'Please login first';
+    $lang->msg_title_is_null = 'Please input the title of message';
+    $lang->msg_content_is_null = 'Please input the content';
+    $lang->msg_allow_message_to_friend = "Failed to send because receiver only allows friends' messages";
+    $lang->msg_disallow_message = 'Failed to send because receiver rejects message reception';
+    $lang->msg_insert_group_name = 'Please input the name of group';
+    $lang->msg_check_group = 'Please select the group';
+
+    $lang->msg_not_uploaded_profile_image = 'Profile image could not be registered';
+    $lang->msg_not_uploaded_image_name = 'Image name could not be registered';
+    $lang->msg_not_uploaded_image_mark = 'Image mark could not be registered';
+
+    $lang->msg_accept_agreement = 'You have to agree the agreement'; 
+
+    $lang->msg_user_denied = 'You have entered a prohibited ID';
+    $lang->msg_user_limited = 'You have entered an ID that can be used after %s';
+
+    $lang->about_user_id = 'User ID should be 3~20 letters long and consist of alphabet+number with alphabet as first letter.';
+    $lang->about_password = 'Password should be 6~20 letters long';
+    $lang->about_user_name = 'Name should be 2~20 letters long';
+    $lang->about_nick_name = 'Nickname should be 2~20 letters long';
+    $lang->about_email_address = 'Email address will be used to modify/find password after email certification';
+    $lang->about_homepage = 'Please input if you have your websites';
+    $lang->about_blog_url = 'Please input if you have your blogs';
+    $lang->about_birthday = 'Please input your birth date';
+    $lang->about_allow_mailing = "If you don't join mailing, you will not able to receive group mail";
+    $lang->about_allow_message = 'You can decide message reception';
+    $lang->about_denied = 'Check to prohibit the ID';
+    $lang->about_is_admin = 'Check to give Superadmin permission';
+    $lang->about_description = "Administrator's memo about members";
+    $lang->about_group = 'An ID can belong to many groups';
+
+    $lang->about_column_type = 'Please set the format of additional sign up form';
+    $lang->about_column_name = 'Please input English name that can be used in template (name as variable)';
+    $lang->about_column_title = 'This will be displayed on sign up or modifying/viewing member info form';
+    $lang->about_default_value = 'You can set default values';
+    $lang->about_active = 'You have to check on active items to show on sign up form';
+    $lang->about_form_description = 'If you input in description form, it will be displayed on sign up form';
+    $lang->about_required = 'If you check, it will be essential item for sign up';
+
+    $lang->about_enable_openid = 'Allow users to sign up as OpenID';
+    $lang->about_enable_join = 'Allow users to sign up';
+    $lang->about_limit_day = 'You can limit certification date after sign up';
+    $lang->about_limit_date = 'User cannot login until assigned date';
+    $lang->about_after_login_url = 'You can set URL after login. Blank means current page.';
+    $lang->about_after_logout_url = 'You can set URL after logout. Blank means current page.';
+    $lang->about_redirect_url = 'Please input URL where users will go after sign up. When this is empty, it will be set as the previous page of sign up page.';
+    $lang->about_agreement = "Sign up agreement will only be displayed when it's not empty";
+
+    $lang->about_image_name = "Allow users to use image name instead of text name";
+    $lang->about_image_mark = "Allow users to use mark in front of their names";
+    $lang->about_profile_image = 'Allow users to use profile images';
+    $lang->about_accept_agreement = "I have read the agreement and agree"; 
+
+    $lang->about_member_default = 'It will be set as default group on sign up';
+
+    $lang->about_openid = 'When you join as OpenID, basic info like ID or email address will be saved on this site, process for password and certification management will be done on current OpenID offering service';
+    $lang->about_openid_leave = 'The secession of OpenID means deletion of your member info from this site.<br />If you login after secession, it will be recognized as a new member, so you will no longer have the permission for your ex-written articles.';
+
+    $lang->about_member = "This is a module for creating/modifying/deleting members and managing group or join form.\nYou can manage members by creating new groups, and get additional information by managing join form";
+    $lang->about_find_member_account = 'Your account info will be noticed by registered email address.<br />Please input email address which you have input on registration, and press "Find Account Info" button.<br />';
+?>

From 695125e0b7abd7d494803dec89456a5c72f0fd8a Mon Sep 17 00:00:00 2001
From: rubyeye <rubyeye@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 15 Apr 2008 14:45:22 +0000
Subject: [PATCH 011/111] =?UTF-8?q?=EB=B9=A0=EC=A0=B8=EC=9E=88=EB=8A=94=20?=
 =?UTF-8?q?</li>=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@4107 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/tpl/find_member_account_mail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/member/tpl/find_member_account_mail.html b/modules/member/tpl/find_member_account_mail.html
index ecd122555..2927e2548 100644
--- a/modules/member/tpl/find_member_account_mail.html
+++ b/modules/member/tpl/find_member_account_mail.html
@@ -6,7 +6,7 @@
     <li>{$lang->user_name} : {$member_info->user_name}</li>
     <li>{$lang->nick_name} :  {$member_info->nick_name}</li>
     <li>{$lang->email_address} : {$member_info->email_address}</li>
-    <li>{$lang->password} : <span style="color:red">{$auth_args->new_password}</span>
+    <li>{$lang->password} : <span style="color:red">{$auth_args->new_password}</span></li>
 </ul>
 <hr noshade="noshade" />
 {$lang->msg_find_account_comment}<br />

From a588225372d79ff435f08c6e66159f35a412d74e Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 16 Apr 2008 03:58:11 +0000
Subject: [PATCH 012/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=EB=B6=80=EB=B6=84=20=EB=B2=88?=
 =?UTF-8?q?=EC=97=AD=20(=ED=8A=B8=EB=9E=99=EB=B0=B1)?=
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@4108 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/trackback/lang/zh-CN.lang.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/trackback/lang/zh-CN.lang.php b/modules/trackback/lang/zh-CN.lang.php
index ab98514dc..9b305afb8 100644
--- a/modules/trackback/lang/zh-CN.lang.php
+++ b/modules/trackback/lang/zh-CN.lang.php
@@ -1,6 +1,6 @@
 <?php
     /**
-     * @file   modules/trackback/lang/ko.lang.php
+     * @file   modules/trackback/lang/zh-CN.lang.php
      * @author zero <zero@nzeo.com>
      * @brief  引用(trackback) 模块的基本语言包
      **/
@@ -10,6 +10,10 @@
     $lang->msg_cart_is_null = '请选择要删除的文章';
     $lang->msg_checked_trackback_is_deleted = '已删除%d个引用';
 
+    $lang->send_trackback_url = '发送地址';
+    $lang->msg_trackback_url_is_invalid = '错误的发送地址！';
+    $lang->msg_trackback_send_success = '成功发送引用。';
+
     $lang->search_target_list = array(
         'url' => '对象URL',
         'blog_name' => '对象网站名称',

From 89090a5cb90b2544471a940a4f13caec2ff2dc19 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 Apr 2008 06:27:41 +0000
Subject: [PATCH 013/111] =?UTF-8?q?#447=20Member=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8/=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85/=EC=A0=95=EB=B3=B4-=EB=B9=84?=
 =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=88=98=EC=A0=95=EB=93=B1=20?=
 =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=EC=9D=98=20=EC=A0=84=EC=86=A1=EC=97=90=20?=
 =?UTF-8?q?=EB=8C=80=ED=95=B4=20SSL=EC=82=AC=EC=9A=A9=EC=9D=84=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD.=20=EB=8B=A8=20=EC=84=9C=EB=B2=84=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20SSL=EC=A7=80=EC=9B=90=EC=9D=B4=20=EB=90=98=EC=96=B4?=
 =?UTF-8?q?=EC=95=BC=20=ED=95=98=EB=A9=B0=20=ED=98=84=EC=9E=AC=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=ED=8F=AC=ED=8A=B8=EC=97=90=20=EB=8C=80=ED=95=B4?=
 =?UTF-8?q?=EC=84=9C=EB=A7=8C=20=EA=B0=9C=EB=B0=9C=20=EC=99=84=EB=A3=8C?=
 =?UTF-8?q?=EB=90=98=EC=97=88=EC=9D=8C.=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=9C=84=EC=A0=AF=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=20=EC=9C=84=EC=A0=AF=EC=97=90=20=EB=8C=80=ED=95=B4=20?=
 =?UTF-8?q?=EB=B3=B4=EC=95=88=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EA=B8=B0=EB=8A=A5=EC=9D=84=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@4109 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php             |  88 +++++++++++++----
 classes/display/DisplayHandler.class.php      |   3 +-
 classes/module/ModuleHandler.class.php        |   8 ++
 common/js/common.js                           |  22 ++++-
 common/js/xml_handler.js                      |  44 ++++++---
 common/tpl/common_layout.html                 |   8 +-
 modules/member/lang/en.lang.php               |   5 +-
 modules/member/lang/es.lang.php               |   3 +
 modules/member/lang/jp.lang.php               |   3 +
 modules/member/lang/ko.lang.php               |   3 +
 modules/member/lang/ru.lang.php               |   3 +
 modules/member/lang/zh-CN.lang.php            |   3 +
 modules/member/member.admin.controller.php    |   3 +-
 modules/member/member.class.php               |  24 +++++
 modules/member/member.controller.php          |   2 +-
 modules/member/skins/default/signup_form.html |   2 +-
 modules/member/tpl/member_config.html         |   7 ++
 widgets/login_info/login_info.class.php       |   7 ++
 .../login_info/skins/default/css/default.css  |  92 ++++++++++--------
 .../default/images/default/logout_btn.gif     | Bin 0 -> 929 bytes
 .../skins/default/images/none_ssl.png         | Bin 0 -> 1152 bytes
 .../login_info/skins/default/images/ssl.png   | Bin 0 -> 1171 bytes
 widgets/login_info/skins/default/js/login.js  |  22 +++--
 .../login_info/skins/default/login_form.html  |  70 +++++++------
 .../login_info/skins/default/login_info.html  |  16 +--
 .../skins/xe_official/css/black.css           |   7 ++
 .../skins/xe_official/css/default.css         |   7 ++
 .../skins/xe_official/css/white.css           |   7 ++
 .../skins/xe_official/images/none_ssl.png     | Bin 0 -> 1152 bytes
 .../skins/xe_official/images/ssl.png          | Bin 0 -> 1171 bytes
 .../login_info/skins/xe_official/js/login.js  |   6 --
 .../skins/xe_official/login_form.html         |   8 +-
 32 files changed, 345 insertions(+), 128 deletions(-)
 create mode 100644 widgets/login_info/skins/default/images/default/logout_btn.gif
 create mode 100644 widgets/login_info/skins/default/images/none_ssl.png
 create mode 100644 widgets/login_info/skins/default/images/ssl.png
 create mode 100644 widgets/login_info/skins/xe_official/images/none_ssl.png
 create mode 100644 widgets/login_info/skins/xe_official/images/ssl.png

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 0498cb5ac..77f3bf9d9 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -10,6 +10,10 @@
     * php5 쓰고 싶당.. ㅡ.ㅜ
     **/
 
+    define('FOLLOW_REQUEST_SSL',0);
+    define('ENFORCE_SSL',1);
+    define('RELEASE_SSL',2);
+
     class Context {
 
         var $request_method = 'GET'; ///< @brief GET/POST/XMLRPC 중 어떤 방식으로 요청이 왔는지에 대한 값이 세팅. GET/POST/XML 3가지가 있음
@@ -19,8 +23,8 @@
 
         var $db_info = NULL; ///< @brief DB 정보
 
+        var $ssl_actions = array(); ///< @brief ssl로 전송해야 할 action등록 (common/js/xml_handler.js에서 ajax통신시 활용)
         var $js_files = array(); ///< @brief display시에 사용하게 되는 js files의 목록
-
         var $css_files = array(); ///< @brief display시에 사용하게 되는 css files의 목록
 
         var $html_header = NULL; ///< @brief display시에 사용하게 되는 <head>..</head>내의 스크립트코드
@@ -129,9 +133,6 @@
             if(file_exists('./.htaccess')&&$this->db_info->use_rewrite == 'Y') $this->allow_rewrite = true;
             else $this->allow_rewrite = false;
 
-            // 상대 경로 설정
-            $this->path = $this->getRequestUri();
-
             // 기본 JS/CSS 등록
             $this->addJsFile("./common/js/x.js");
             $this->addJsFile("./common/js/common.js");
@@ -148,7 +149,7 @@
                         if(!$val) continue;
                         $url .= ($url?'&':'').$key.'='.$val;
                     }
-                    Context::set('current_url',sprintf('%s?%s',$this->path, $url));
+                    Context::set('current_url',sprintf('%s?%s', $this->getRequestUri(), $url));
                 } else {
                     Context::set('current_url',$this->getUrl());
                 }
@@ -576,33 +577,36 @@
             $var_count = count($get_vars);
             if(!$var_count) return '';
 
+            if($get_vars['act'] && $this->isExistsSSLAction($get_vars['act'])) $path = $this->getRequestUri(ENFORCE_SSL);
+            else $path = $this->getRequestUri(RELEASE_SSL);
+
             // rewrite모듈을 사용하고 인자의 값이 4개 이하일 경우
             if($this->allow_rewrite && $var_count < 4) {
                 $var_keys = array_keys($get_vars);
 
                 if($var_count == 1) {
-                    if($var_keys[0]=='mid') return $this->path.$get_vars['mid'];
-                    elseif($var_keys[0]=='document_srl') return $this->path.$get_vars['document_srl'];
+                    if($var_keys[0]=='mid') return $path.$get_vars['mid'];
+                    elseif($var_keys[0]=='document_srl') return $path.$get_vars['document_srl'];
                 } elseif($var_count == 2) {
                     asort($var_keys);
                     $target = implode('.',$var_keys);
-                    if($target=='act.mid' && !preg_match('/([A-Z]+)/',$get_vars['act'])) return sprintf('%s%s/%s',$this->path,$get_vars['mid'],$get_vars['act']);
-                    elseif($target=='document_srl.mid')  return sprintf('%s%s/%s',$this->path,$get_vars['mid'],$get_vars['document_srl']);
-                    elseif($target=='act.document_srl')  return sprintf('%s%s/%s',$this->path,$get_vars['document_srl'],$get_vars['act']);
-                    elseif($target=='mid.page')  return sprintf('%s%s/page/%s',$this->path,$get_vars['mid'],$get_vars['page']);
-                    elseif($target=='category.mid')  return sprintf('%s%s/category/%s',$this->path,$get_vars['mid'],$get_vars['category']);
+                    if($target=='act.mid' && !preg_match('/([A-Z]+)/',$get_vars['act'])) return sprintf('%s%s/%s',$path,$get_vars['mid'],$get_vars['act']);
+                    elseif($target=='document_srl.mid')  return sprintf('%s%s/%s',$path,$get_vars['mid'],$get_vars['document_srl']);
+                    elseif($target=='act.document_srl')  return sprintf('%s%s/%s',$path,$get_vars['document_srl'],$get_vars['act']);
+                    elseif($target=='mid.page')  return sprintf('%s%s/page/%s',$path,$get_vars['mid'],$get_vars['page']);
+                    elseif($target=='category.mid')  return sprintf('%s%s/category/%s',$path,$get_vars['mid'],$get_vars['category']);
                 } elseif($var_count == 3) {
                     asort($var_keys);
                     $target = implode('.',$var_keys);
                     if($target=='act.document_srl.key') {
-                        return sprintf('%s%s/%s/%s',$this->path,$get_vars['document_srl'],$get_vars['key'],$get_vars['act']);
+                        return sprintf('%s%s/%s/%s',$path,$get_vars['document_srl'],$get_vars['key'],$get_vars['act']);
                     } elseif($target=='category.mid.page') {
-                        return sprintf('%s%s/category/%s/page/%s',$this->path,$get_vars['mid'],$get_vars['category'],$get_vars['page']);
+                        return sprintf('%s%s/category/%s/page/%s',$path,$get_vars['mid'],$get_vars['category'],$get_vars['page']);
                     } elseif($target=='mid.search_keyword.search_target' && $get_vars['search_target']=='tag') {
-                        return sprintf('%s%s/tag/%s',$this->path,$get_vars['mid'],str_replace(' ','-',$get_vars['search_keyword']));
+                        return sprintf('%s%s/tag/%s',$path,$get_vars['mid'],str_replace(' ','-',$get_vars['search_keyword']));
                     } elseif($target=='mid.search_keyword.search_target' && $get_vars['search_target']=='regdate') {
-                        if(strlen($get_vars['search_keyword'])==8) return sprintf('%s%s/%04d/%02d/%02d',$this->path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2),substr($get_vars['search_keyword'],6,2));
-                        elseif(strlen($get_vars['search_keyword'])==6) return sprintf('%s%s/%04d/%02d',$this->path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2));
+                        if(strlen($get_vars['search_keyword'])==8) return sprintf('%s%s/%04d/%02d/%02d',$path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2),substr($get_vars['search_keyword'],6,2));
+                        elseif(strlen($get_vars['search_keyword'])==6) return sprintf('%s%s/%04d/%02d',$path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2));
                     }
                 }
             }
@@ -613,14 +617,26 @@
                 $url .= ($url?'&':'').$key.'='.urlencode($val);
             }
 
-            return $this->path.'?'.htmlspecialchars($url);
+            return $path.'?'.htmlspecialchars($url);
         }
 
         /**
          * @brief 요청이 들어온 URL에서 argument를 제거하여 return
          **/
-        function getRequestUri() {
-            return sprintf("http://%s%s",$_SERVER['HTTP_HOST'], getScriptPath());
+        function getRequestUri($ssl_mode = FOLLOW_REQUEST_SSL) {
+            switch($ssl_mode) {
+                case FOLLOW_REQUEST_SSL :
+                        if($_SERVER['HTTPS']=='on') $use_ssl = true;
+                        else $use_ssl = false;
+                    break;
+                case ENFORCE_SSL :
+                        $use_ssl = true;
+                    break;
+                case RELEASE_SSL :
+                        $use_ssl = false;
+                    break;
+            }
+            return sprintf("%s://%s%s",$use_ssl?'HTTPS':'HTTP',$_SERVER['HTTP_HOST'], getScriptPath());
         }
 
         /**
@@ -711,6 +727,38 @@
             return clone($this->get_vars);
         }
 
+        /**
+         * @brief SSL로 인증되어야 할 action이 있을 경우 등록
+         * common/js/xml_handler.js에서 이 action들에 대해서 https로 전송되도록 함
+         **/
+        function addSSLAction($action) {
+            $oContext = &Context::getInstance();
+            return $oContext->_addSSLAction($action);
+        }
+
+        function _addSSLAction($action) {
+            if(in_array($action, $this->ssl_actions)) return;
+            $this->ssl_actions[] = $action;
+        }
+
+        function getSSLActions() {
+            $oContext = &Context::getInstance();
+            return $oContext->_getSSLActions();
+        }
+
+        function _getSSLActions() {
+            return $this->ssl_actions;
+        }
+
+        function isExistsSSLAction($action) {
+            $oContext = &Context::getInstance();
+            return $oContext->_isExistsSSLAction($action);
+        }
+
+        function _isExistsSSLAction($action) {
+            return in_array($action, $this->ssl_actions);
+        }
+
         /**
          * @brief js file을 추가
          **/
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index dbcae7c14..256716f32 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -45,14 +45,13 @@
                     $layout_file = $oModule->getLayoutFile();
                     $edited_layout_file = $oModule->getEditedLayoutFile();
                 }
-
                 if(!$layout_path) $layout_path = './common/tpl/';
                 if(!$layout_file) $layout_file = 'default_layout.html';
-
                 $zbxe_final_content = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
 
                 if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start;
 
+
                 // 각 위젯, 에디터 컴포넌트의 코드 변경
                 if(__DEBUG__==3) $start = getMicroTime();
 
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 62b5f65c6..979207b5b 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -334,12 +334,20 @@
                 $oModule->setModule($module);
                 $oModule->setModulePath($class_path);
 
+                // 요청된 module에 constructor가 있으면 실행
+                if(!isset($GLOBALS['_called_constructor'][$module])) {
+                    $GLOBALS['_called_constructor'][$module] = true;
+                    if(@method_exists($oModule, $module)) $oModule->{$module}();
+                }
+
                 // GLOBALS 변수에 생성된 객체 저장
                 $GLOBALS['_loaded_module'][$module][$type][$kind] = $oModule;
             }
 
             if(__DEBUG__==3) $GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
 
+            // init method가 있으면 실행
+
             // 객체 리턴
             return $GLOBALS['_loaded_module'][$module][$type][$kind];
         }
diff --git a/common/js/common.js b/common/js/common.js
index 7aac19292..b9c9a5b67 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -48,7 +48,17 @@ String.prototype.setQuery = function(key, val) {
     } else {
         if(val.toString().trim()) uri = uri+"?"+key+"="+val;
     }
-    //uri = uri.replace(request_uri+'?',request_uri+'index.php?');
+
+    uri = uri.replace(/^https:\/\//i,'http://');
+    if(typeof(ssl_actions)!='undefined' && typeof(ssl_actions.length)!='undefined' && uri.getQuery('act')) {
+        var act = uri.getQuery('act');
+        for(i=0;i<ssl_actions.length;i++) {
+            if(ssl_actions[i]==act) {
+                uri = uri.replace(/^http:\/\//i,'https://');
+                break;
+            }
+        }
+    }
     return uri;
 }
 
@@ -989,3 +999,13 @@ if(xIE4Up) {
         }
     }
 }
+
+
+/* 보안 로그인 모드로 전환 */
+function toggleSecuritySignIn() {
+    var href = location.href;
+    if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http');
+    else location.href = href.replace(/^http/i,'https');
+}   
+
+
diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js
index 5ac4284ca..7b6572040 100644
--- a/common/js/xml_handler.js
+++ b/common/js/xml_handler.js
@@ -19,15 +19,6 @@ function exec_xml(module, act, params, callback_func, response_tags, callback_fu
 
     if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = new Array('error','message');
 
-    var waiting_obj = xGetElementById("waitingforserverresponse");
-    if(show_waiting_message && waiting_obj) {
-        xInnerHtml(waiting_obj, waiting_message);
-
-        xTop(waiting_obj, xScrollTop()+20);
-        xLeft(waiting_obj, xScrollLeft()+20);
-        waiting_obj.style.visibility = "visible";
-    }
-
     oXml.request(xml_response_filter, oXml, callback_func, response_tags, callback_func_arg, fo_obj);
 }
 
@@ -95,7 +86,7 @@ function xml_handlerRequest(callBackFunc, xmlObj, callBackFunc2, response_tags,
     +  "<params>\n"
 
     for (var key in this.params) {
-	if(!this.params.hasOwnProperty(key)) continue;
+        if(!this.params.hasOwnProperty(key)) continue;
         var val = this.params[key];
         rd += "<"+key+"><![CDATA["+val+"]]></"+key+">\n";
     }
@@ -103,12 +94,43 @@ function xml_handlerRequest(callBackFunc, xmlObj, callBackFunc2, response_tags,
     rd += "</params>\n"
     +  "</methodCall>\n";
 
+    // ssl action
+    if(typeof(ssl_actions)!='undefined' && typeof(ssl_actions.length)!='undefined' && typeof(this.params['act'])!='undefined' && /^https:\/\//i.test(location.href) ) {
+        var action = this.params['act'];
+        for(i=0;i<ssl_actions.length;i++) {
+            if(ssl_actions[i]==action) {
+                this.xml_path = this.xml_path.replace(/^http:\/\//i,'https://');
+                break;
+            }
+        }
+    }
+
     if(this.obj_xmlHttp.readyState!=0) {
         this.obj_xmlHttp.abort();
         this.obj_xmlHttp = this.getXmlHttp();
     }
     this.obj_xmlHttp.onreadystatechange = function () {callBackFunc(xmlObj, callBackFunc2, response_tags, callback_func_arg, fo_obj)};
-    this.obj_xmlHttp.open("POST", this.xml_path, true);
+
+    // 모든 xml데이터는 POST방식으로 전송. try-cacht문으로 오류 발생시 대처
+    try {
+
+        this.obj_xmlHttp.open("POST", this.xml_path, true);
+
+    } catch(e) {
+        alert(e);
+        return;
+    }
+
+    // ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음)
+    var waiting_obj = xGetElementById("waitingforserverresponse");
+    if(show_waiting_message && waiting_obj) {
+        xInnerHtml(waiting_obj, waiting_message);
+
+        xTop(waiting_obj, xScrollTop()+20);
+        xLeft(waiting_obj, xScrollLeft()+20);
+        waiting_obj.style.visibility = "visible";
+    }
+
     this.obj_xmlHttp.send(rd);
 }
 
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 6f339a186..15f8d3845 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -1,4 +1,4 @@
-{@ $js_files = Context::getJsFile() }{@ $css_files = Context::getCssFile() }<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="{Context::getLangType()}" xml:lang="{Context::getLangType()}" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -17,6 +17,7 @@
 <!--@end-->
     <meta http-equiv="imagetoolbar" content="no" />
     <title>{Context::getBrowserTitle()}</title>
+{@ $js_files = Context::getJsFile() }
 <!--@foreach($js_files as $key => $js_file)-->
 <!--@if($js_file['targetie'])-->
     <!--[if {$js_file['targetie']}]>
@@ -26,6 +27,8 @@
     <![endif]-->
 <!--@end-->
 <!--@end-->
+
+{@ $css_files = Context::getCssFile() }
 <!--@foreach($css_files as $key => $css_file)-->
 <!--@if($css_file['targetie'])-->
     <!--[if {$css_file['targetie']}]>
@@ -38,11 +41,14 @@
 <!--@if($rss_url)-->
     <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="{$rss_url}" />
 <!--@end-->
+
+{@ $ssl_actions = Context::getSSLActions() }
     <script type="text/javascript">//<![CDATA[
         var current_url = "{$current_url}";
         var request_uri = "{$request_uri}";
         var current_mid = "{$mid}";
         var waiting_message = "{$lang->msg_call_server}";
+        var ssl_actions = new Array(<!--@if(count($ssl_actions))-->"{implode('","',$ssl_actions)}"<!--@end-->);
     //]]></script>
 
     {Context::getHtmlHeader()}
diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index 0680de2e3..fc005483c 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -45,6 +45,8 @@
 	$lang->signature_max_height = 'Max Signature Height';
     $lang->enable_openid = 'Enable OpenID';
     $lang->enable_join = 'Allow Member Join';
+    $lang->enable_ssl = 'Enable SSL';
+    $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = 'Temporary Limit Date';
     $lang->limit_date = 'Limit Date';
     $lang->after_login_url = 'URL after Login';
@@ -64,7 +66,7 @@
     $lang->webmaster_email = "Webmaster's Email";
 
     $lang->about_keep_signed = 'Though the browser is closed, you might be kept signed.\n\nIf you use this feature at the shared computer, your personal information might be accessed by others, thus do not use this feature at the shared computer. ';
-    $lang->about_webmaster_name = "Please input webmaster's name which will be used for certification mails or other site administration. (default : webmaster)";
+	$lang->about_webmaster_name = "Please input webmaster's name which will be used for certification mails or other site administration. (default : webmaster)";
     $lang->about_webmaster_email = "Please input webmaster's email address.";
 
     $lang->search_target_list = array(
@@ -184,6 +186,7 @@
 
     $lang->about_enable_openid = 'Allow users to sign up as OpenID';
     $lang->about_enable_join = 'Allow users to sign up';
+    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = 'You can limit certification date after sign up';
     $lang->about_limit_date = 'User cannot login until assigned date';
     $lang->about_after_login_url = 'You can set URL after login. Blank means current page.';
diff --git a/modules/member/lang/es.lang.php b/modules/member/lang/es.lang.php
index 1e9febe2f..c09802c44 100644
--- a/modules/member/lang/es.lang.php
+++ b/modules/member/lang/es.lang.php
@@ -44,6 +44,8 @@
     $lang->image_mark_max_height = 'Altura Máxima';
     $lang->enable_openid = 'Activar OpenID';
     $lang->enable_join = 'Permitir el registro del usuario';
+    $lang->enable_ssl = 'Activar SSL';
+    $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = 'Límite de la fecha temporal';
     $lang->limit_date = 'Límite de fecha';
     $lang->after_login_url = 'URL después del inicio de sesión';
@@ -181,6 +183,7 @@
 
     $lang->about_enable_openid = 'Selecciona esta opción si activado OpenID';
     $lang->about_enable_join = 'Debe seleccionar esta opción para permitir el registro de los usuarios';
+    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = 'Usted puede limitar la fecha de la certificación luego de registrar';
     $lang->about_limit_date = 'Usuario no podra conectarse hasta la fecha indicada';
     $lang->about_after_login_url = '로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.';
diff --git a/modules/member/lang/jp.lang.php b/modules/member/lang/jp.lang.php
index f00f7adfc..9a04eadb3 100644
--- a/modules/member/lang/jp.lang.php
+++ b/modules/member/lang/jp.lang.php
@@ -45,6 +45,8 @@
     $lang->signature_max_height = '署名欄の高さの制限';
 	$lang->enable_openid = 'OpenID使用';
     $lang->enable_join = '会員加入を許可する';
+    $lang->enable_ssl = 'SSL使用';
+    $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = '臨時制限日';
     $lang->limit_date = '制限日';
     $lang->after_login_url = 'ログイン後表示するページのURL';
@@ -184,6 +186,7 @@
 
     $lang->about_enable_openid = 'OpenIDをサポートする際にチェックを入れます。';
     $lang->about_enable_join = 'チェックを入れないとユーザが会員に加入できません。';
+    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = '会員加入後一定の期間中、認証制限を行うことができます。';
     $lang->about_limit_date = '指定された期間まで該当ユーザはログインできなくします。';
     $lang->about_after_login_url = 'ログイン後表示されるページのURLを指定できます。指定のない場合、現在のページが維持されます。';
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 1b666c463..03aca5dd8 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -45,6 +45,8 @@
     $lang->signature_max_height = '서명 높이 제한';
     $lang->enable_openid = 'OpenID 지원';
     $lang->enable_join = '회원 가입 허가';
+    $lang->enable_ssl = 'SSL 기능 사용';
+    $lang->security_sign_in = '보안로그인 사용';
     $lang->limit_day = '임시 제한 일자';
     $lang->limit_date = '제한일';
     $lang->after_login_url = '로그인 후 이동할 URL';
@@ -184,6 +186,7 @@
 
     $lang->about_enable_openid = 'OpenID 지원을 할 경우 체크하시면 됩니다';
     $lang->about_enable_join = '체크를 하셔야 사용자들이 회원가입을 할 수 있습니다';
+    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = '회원 가입후 정해진 일자동안 인증 제한을 할 수 있습니다';
     $lang->about_limit_date = '지정된 일자까지 해당 사용자는 로그인을 할 수 없습니다';
     $lang->about_after_login_url = '로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.';
diff --git a/modules/member/lang/ru.lang.php b/modules/member/lang/ru.lang.php
index 8ec51fda2..ce81d2886 100644
--- a/modules/member/lang/ru.lang.php
+++ b/modules/member/lang/ru.lang.php
@@ -44,6 +44,8 @@
     $lang->image_mark_max_height = 'Макс. высота';
     $lang->enable_openid = 'Включить открытый ID (OpenID)';
     $lang->enable_join = 'Позволить пользователям регистрироваться';
+    $lang->enable_ssl = 'SSL 기능 사용';
+    $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = 'Временный лимит даты';
     $lang->limit_date = 'Дата лимита';
     $lang->after_login_url = '로그인 후 이동할 URL';
@@ -181,6 +183,7 @@
 
     $lang->about_enable_openid = 'Позволить пользователям регистрироваться как OpenID';
     $lang->about_enable_join = 'Позволить пользователям регистрироваться';
+    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = 'Вы можете ограничить дату сертификации после регистрации';
     $lang->about_limit_date = 'Пользователь не может войти до указанной даты';
     $lang->about_after_login_url = '로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.';
diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index 494e3240b..d0277b72b 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -45,6 +45,8 @@
     $lang->signature_max_height = '签名高度限制';
     $lang->enable_openid = '支持OpenID';
     $lang->enable_join = '允许会员注册';
+    $lang->enable_ssl = 'SSL 기능 사용';
+    $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = '认证限制';
     $lang->limit_date = '限制日期';
     $lang->after_login_url = '登录后页面转向';
@@ -184,6 +186,7 @@
 
     $lang->about_enable_openid = '要想网站支持OpenID时请勾选此项。';
     $lang->about_enable_join = '选择此项后用户才可以注册。';
+    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = '注册会员后的认证有效期限。';
     $lang->about_limit_date = '直到指定日期该用户不能登录。';
     $lang->about_after_login_url = '可以指定登录后的页面转向url(留空为当前页面)。';
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 1d9a9887e..c41b547ab 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -83,10 +83,11 @@
          **/
         function procMemberAdminInsertConfig() {
             // 기본 정보를 받음
-            $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','limit_day','after_login_url','after_logout_url','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height','editor_skin');
+            $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','enable_ssl','limit_day','after_login_url','after_logout_url','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height','editor_skin');
             if(!$args->skin) $args->skin = "default";
             if(!$args->colorset) $args->colorset = "white";
             if($args->enable_join!='Y') $args->enable_join = 'N';
+            if($args->enable_ssl!='Y') $args->enable_ssl = 'N';
             if($args->enable_openid!='Y') $args->enable_openid= 'N';
             if($args->profile_image !='Y') $args->profile_image = 'N';
             if($args->image_name!='Y') $args->image_name = 'N';
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 3a15de02d..dbf8f829f 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -7,6 +7,30 @@
 
     class member extends ModuleObject {
 
+        /**
+         * @brief constructor
+         **/
+        function member() {
+            if(!Context::isInstalled()) return;
+
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+
+            // SSL 사용시 회원가입/정보/비밀번호등과 관련된 action에 대해 SSL 전송하도록 지정
+            if($member_config->enable_ssl == 'Y') {
+                Context::addSSLAction('dispMemberLoginForm');
+                Context::addSSLAction('dispMemberModifyPassword');
+                Context::addSSLAction('dispMemberSignUpForm');
+                Context::addSSLAction('dispMemberModifyInfo');
+                Context::addSSLAction('dispMemberOpenIDLogin');
+                Context::addSSLAction('procMemberLogin');
+                Context::addSSLAction('procMemberModifyPassword');
+                Context::addSSLAction('procMemberInsert');
+                Context::addSSLAction('procMemberModifyInfo');
+                Context::addSSLAction('procMemberOpenIDLogin');
+            }
+        }
+
         /**
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 6a9726116..c0415e1dd 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -66,7 +66,7 @@
                 $this->setError(-1);
                 $this->setMessage($error['description']);
             } else {
-                $openid->SetApprovedURL( sprintf('%s?module=member&act=procMemberOpenIDValidate', Context::getRequestUri()) );
+                $openid->SetApprovedURL( sprintf('%s?module=member&act=procMemberOpenIDValidate', Context::getRequestUri(RELEASE_SSL)) );
                 $url = $openid->GetRedirectURL();
                 $this->add('redirect_url', $url);
             }
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index e5751eadd..65c63749c 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -15,7 +15,7 @@
 <!--#include("./common_header.html")-->
 
 	<div class="boardHeader">
-		<h3>{$lang->msg_new_member}</h3>
+		<h3>{$lang->cmd_signup}</h3>
 	</div>
 
     <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, signup)">
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html
index d30ef4241..d605c1df0 100644
--- a/modules/member/tpl/member_config.html
+++ b/modules/member/tpl/member_config.html
@@ -37,6 +37,13 @@
             {$lang->about_enable_join}
         </td>
     </tr>
+    <tr>
+        <th scope="row">{$lang->enable_ssl}</th>
+        <td>
+            <input type="checkbox" name="enable_ssl" value="Y" <!--@if($config->enable_ssl=='Y')-->checked="checked"<!--@end--> class="checkbox" />
+            {$lang->about_enable_ssl}
+        </td>
+    </tr>
     <tr>
         <th scope="row">{$lang->limit_day}</th>
         <td>
diff --git a/widgets/login_info/login_info.class.php b/widgets/login_info/login_info.class.php
index 8fe336b34..92324d60b 100644
--- a/widgets/login_info/login_info.class.php
+++ b/widgets/login_info/login_info.class.php
@@ -29,6 +29,13 @@
             $this->member_config = $oModuleModel->getModuleConfig('member');
             Context::set('member_config', $this->member_config);
 
+            // ssl 사용시 현재 https접속상태인지에 대한 flag및 https url 생성
+            $ssl_mode = false;
+            if($this->member_config->enable_ssl == 'Y') {
+                if(preg_match('/^https:\/\//i',Context::getRequestUri())) $ssl_mode = true;
+            }
+            Context::set('ssl_mode',$ssl_mode);
+
             // 템플릿 컴파일
             $oTemplate = &TemplateHandler::getInstance();
             return $oTemplate->compile($tpl_path, $tpl_file);
diff --git a/widgets/login_info/skins/default/css/default.css b/widgets/login_info/skins/default/css/default.css
index 85df3265c..597c82d9d 100644
--- a/widgets/login_info/skins/default/css/default.css
+++ b/widgets/login_info/skins/default/css/default.css
@@ -1,46 +1,60 @@
-.fc_01 { color:#797771; }
-.fc_02 { color:#9A9893; }
+.default_login { color:#797771;}
+.openid_login { display:none; }
 
-.box_login { border:solid 3px #D5D8DB; background:#FFFFFE; margin-bottom:10px;}
+/* login form */
+.default_login form { position:relative; }
+.default_login .form_field { padding:5px 60px 5px 5px; white-space:nowrap; overflow:hidden; height:45px; }
 
-.box_login .user_info { padding:5px 0 0 5px; height:22px; }
+.default_login .form_field .openIDTitle { width:99%; white-space:nowrap; overflow:hidden; background:url("../images/openid_login_bg.gif") no-repeat left top; padding:1px 0 0 18px; margin-bottom:8px; color:#888888; font-weight:bold; }
+.default_login .form_field .openIDTitle input { margin:0; padding:0; height:14px; }
+.default_login .form_field input.input { display:block; width:99%;  background-color: #ffffff;  border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;  padding:2px; height:14px; color:#666666;  margin:2px 0 2px 0;}
 
-.box_login .hr_dot_01 { background:url(../images/default/hr_dot_01.gif) repeat-x; height:2px; overflow:hidden; clear:both; margin:6px; }
-.box_login .item { background:url(../images/default/bul_01.gif) no-repeat 5px 5px; height:16px; padding:3px 0px 0px 20px; margin-left:5px; margin-top:2px; }
-.box_login .item a { color:#666666; text-decoration:none; }
-.box_login .item { font-size:11px; letter-spacing:-1px; margin-right:10px; padding:3px 0px 0px 20px; white-space:nowrap; }
-.box_login .profile { width:70px; float:left; background:url(../images/default/icon_profile.gif) no-repeat left; }
-.box_login .message { width:70px; float:left; background:url(../images/default/icon_note.gif) no-repeat left; }
-.box_login .friend { float:left; background:url(../images/default/icon_friend.gif) no-repeat left; }
-.box_login .administrative { float:left; background:url(../images/default/icon_key.gif) no-repeat left; margin-right:0px; }
-.box_login .administrative a { color:#D80D0F; }
-.box_login .lastlogin { clear:both; padding-bottom:5px;}
+.default_login input.submit { width:45px; height:45px; background:url(../images/default/login_btn_submit.gif) no-repeat; border:none; margin:0; cursor:pointer; position:absolute; right:5px; top:5px; }
 
-.box_login .form_field { float:left; margin:9px 9px 0 9px; _margin:3px 3px 0 3px; height:55px; }
-.box_login .form_field div { margin-top:2px; margin-bottom:3px; }
-.box_login input.submit { width:45px; height:45px; background:url(../images/default/login_btn_submit.gif) no-repeat; border:none; margin:9px 0 0 0; _margin:5px 0 0 0; cursor:pointer; }
-.box_login .input { width:140px; background-color: #ffffff;  border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;  padding:2px; height:14px; margin:0px; cursor:text; color:#666666;}
-.box_login ul { margin:0; padding:0; }
-.box_login ul.option { clear:both; height:20px; margin:0 0 0 9px;}
-.box_login ul.option li { float:left; list-style:none;}
-.box_login ul.option li a.btn { background:url(../images/default/bul_01.gif) no-repeat left; padding-left:10px; margin-left:14px; }
-.box_login .checkbox  { width:15px; height:15px; margin:-1px 0px 0px -1px; margin-right:2px; }
-.box_login .clear { clear:both; }
-.box_login ul { margin:0; padding:0; }
-.box_login ul.extra_option { clear:both; height:40px; }
-.box_login ul.extra_option li a {text-decoration:none;}
-.box_login ul.extra_option li a.btn { background:url(../images/default/bul_01.gif) no-repeat left; padding-left:10px; margin-left:10px; }
+.default_login form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 4px 7px; }
+.default_login form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+.default_login form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+.default_login form p.noneSSL a { color:#BF6801; text-decoration:none; }
+.default_login form p.SSL a { color:#9CAC74; text-decoration:none; }
 
-.openid_login { clear:both; height:38px; border:3px solid #D5D8DB; background-color:#FFFFFF; margin:0 0 10px 0; }
-.openid_login .openid_user_id { width:110px; _width:100px; background: url(../images/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:16px; line-height:1em; vertical-align:middle; margin-bottom:.5em; color:#666666;}
+.default_login p { padding:0; margin:0 0 0 5px; }
 
-.openid_login .wButtonTypeA { display:block; cursor:pointer; background:url(../images/default/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;}
-.openid_login .wButtonTypeA:hover { text-decoration:none;}
-.openid_login .wButtonTypeA img { vertical-align:middle;}
-.openid_login .wButtonTypeA input { border:none; cursor:pointer; background:url(../images/default/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;  vertical-align:middle; }
-.openid_login .wButtonTypeA .leftCap { width:2px; height:24px; background:url(../images/default/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0;  position:relative; left:-1px;}
-.openid_login .wButtonTypeA .rightCap { width:2px; height:24px; background:url(../images/default/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;}
-.openid_login .wButtonTypeA .icon { margin:0 .2em;}
-.openid_login .wButtonWrite ul { text-align:center; clear:both; display:block; margin:0; padding:0; }
-.openid_login .wButtonWrite li { margin-top:.5em; float:left; margin-left:.3em; list-style:none;}
+.default_login .checkbox  { width:15px; height:15px; margin:-1px 0px 0px -1px; margin-right:2px; }
+.default_login .clear { clear:both; }
+
+.default_login ul.extra_option { margin:5px 0 0 0; padding:0; clear:both; height:40px; }
+.default_login ul.extra_option li { background:url(../images/default/bul_01.gif) no-repeat 7px 3px; padding-left:20px; margin-left:5px; margin-bottom:3px;}
+.default_login ul.extra_option li a {text-decoration:none; color:#666666;}
+
+
+.default_openid_login { display:none; clear:both; height:38px; border:3px solid #D5D8DB; background-color:#FFFFFF; margin:0 0 10px 0; }
+.default_openid_login .openid_user_id { width:110px; _width:100px; background: url(../images/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:16px; line-height:1em; vertical-align:middle; margin-bottom:.5em; color:#666666;}
+
+.default_openid_login .wButtonTypeA { display:block; cursor:pointer; background:url(../images/default/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;}
+.default_openid_login .wButtonTypeA:hover { text-decoration:none;}
+.default_openid_login .wButtonTypeA img { vertical-align:middle;}
+.default_openid_login .wButtonTypeA input { border:none; cursor:pointer; background:url(../images/default/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;  vertical-align:middle; }
+.default_openid_login .wButtonTypeA .leftCap { width:2px; height:24px; background:url(../images/default/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0;  position:relative; left:-1px;}
+.default_openid_login .wButtonTypeA .rightCap { width:2px; height:24px; background:url(../images/default/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;}
+.default_openid_login .wButtonTypeA .icon { margin:0 .2em;}
+.default_openid_login .wButtonWrite ul { text-align:center; clear:both; display:block; margin:0; padding:0; }
+.default_openid_login .wButtonWrite li { margin-top:.5em; float:left; margin-left:.3em; list-style:none;}
+
+
+/* logged  info */
+.default_login .loginUser { position:relative; padding:5px; }
+.default_login .loginUser .userNickName { margin-right:50px; white-space:nowrap; overflow:hidden; }
+.default_login .loginUser .logoutButton { position:absolute; right:5px; top:5px; }
+
+.default_login .hr_dot_01 { background:url(../images/default/hr_dot_01.gif) repeat-x; height:2px; overflow:hidden; clear:both; margin:6px; }
+
+.default_login .item { background:url(../images/default/bul_01.gif) no-repeat 5px 5px; height:16px; padding:3px 0px 0px 20px; margin-left:5px; margin-top:2px; }
+.default_login .item a { color:#666666; text-decoration:none; }
+.default_login .item { font-size:11px; letter-spacing:-1px; margin-right:10px; padding:3px 0px 0px 20px; white-space:nowrap; }
+.default_login .profile { width:70px; float:left; background:url(../images/default/icon_profile.gif) no-repeat left; }
+.default_login .message { width:70px; float:left; background:url(../images/default/icon_note.gif) no-repeat left; }
+.default_login .friend { float:left; background:url(../images/default/icon_friend.gif) no-repeat left; }
+.default_login .administrative { float:left; background:url(../images/default/icon_key.gif) no-repeat left; margin-right:0px; }
+.default_login .administrative a { color:#D80D0F; }
+.default_login .lastlogin { clear:both; padding:5px; white-space:wrap; font-size:8pt; }
 
diff --git a/widgets/login_info/skins/default/images/default/logout_btn.gif b/widgets/login_info/skins/default/images/default/logout_btn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fb036508430720fa52b08ef0b8f9e3825633cb6a
GIT binary patch
literal 929
zcmchU+fP$>0Dyn(X|Xh}EmRJ)nrJJQ>PqmEDNL4~R;zKwq!?;Xb!Nw9CRLNEiP;|4
z7CN9YS_YadUO)|oRUfKGAyu%YR_a(&&@wRkq87wt54Puib+A8T-}{&E;oH4uS7XzW
z22cs+y?|jTnkG4(6-5CjOB}}%WQn3lmZJ$0XE}zX2wvbw5+}%_An*i*lN8Rdlq3p*
zz_BbXE+Pp8Q4&O6k_3vvd7h&dEuLjrM&LP;CPa}Zh$6+13`5V(<`-3RsX`D`N#J>$
zC^0O}3%n?aG($?FIP!S-aU%X`bcpBJg@t*ND*ZW;7DRz&7W2jFzo%%HPLC&NW?qbE
zQmH4SFY>v+vYF)ABZ|hSo@bL|4|9_fQ&U+{;K!e((od7wY=&c*Ty7$j9-Wzap3mnV
zjy#xsIc>FCaiS<m;-~)r|2rmDAp^h*Y)j>(Ct%qpzqhrmJ@jiwXII#3*@~WzbpO`V
zd!cu$#e#Y+U%A@Xf9?7;)Y5Y4M&G7CZug^KH=}x3e@|a+ggr16hpRo+4I_}==z$Wq
zj8KEILGKxYo*B{R{V1euYI1AyhB~*~pfx~+SCF~RU@n;7y1)5Q_p$Ka455xas21^K
zu22#QYOSrO?Gd>{x5_#^I2M4MI_1i^YxsMmQvG?X#vXJcvL3f$kZ{fYuvg|jzGCo=
zePFNFc32(r;R79VWvtl{bOw6Vs;Cw5BlZj0)xBTtJ2)`5OzF9Gz!k4LR(12x@8;p~
zK)J>SYQaK_5-A5jiuU?ioQ|#sr>CRSfuZ{E?z<0y{uA5kfvxc(Ru0;p1UASt36*OO
z%t7btcbr@0-~28cS>3bnZTim9O4QFJ?qc?^vJh?e?fY>@hst#PXEbJVwrdJMbz}}7
zO$E&>qi0kV$uD4wD~2H5zyVclTmIU2>MNNV`mA!NKe8qeC{~zjRVNeia7lOjh7XwJ
zYMcEWX2LK<nY`woguG0HB^<wOufak=g$@frx)R+7Db6CGU2_&g+7!z>l@(jCBk9iC
zi@vvA)|;JXcuQu@_3*~0*0u2FNhGwcaei<u+&URauRzMy7a}|1V})+7LJqe73x|TU
ALjV8(

literal 0
HcmV?d00001

diff --git a/widgets/login_info/skins/default/images/none_ssl.png b/widgets/login_info/skins/default/images/none_ssl.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7561bfc406031553257c5750f5429174d66c468
GIT binary patch
literal 1152
zcmV-`1b_R9P)<h;3K|Lk000e1NJLTq000mG000dL0{{R3mt`In00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ<08mU+Magk(>ynS`nwR?M=jeTS=zDhh>FDNZW6Xzz
z&61Gz*w^Q6XUcbT_0!Vy%E{?~e9n}T=WlB8wzT`~?ChPJ=y`Pb-{1ZC_vdV8=y-GW
z($VK@W$mJ$xwx?V?d`8mO6{PXxwx<*A|fLrBP1jwB_$;$CMG8*CnzW=DJdx`Dk>{0
zD=aK5EiElBE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*
zJv}`>K0ZG`KR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)Ts
zPEJoxPf$=$QBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~c
zUtnNhVPRonVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvM
zadB~Sa&mKXb98icb#--ic6N7ncX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7
zf`WsCgM@^Hg@uKNhK7fShlq%XiHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?
zla!Q{m6es2mX?>7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyy
zrKP2&rlzN-r>Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9aj
zwzjvox45{txw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T
z$H>UY$;rve%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D
z+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}
z>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(
z`~3X;{r&y^{{H{}{~}16mjD0&B6LztQ~&?}|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0
z|NsC0|Nj6D(8F;6006v6L_t(|+G0=y19>2TumA#x0m2m!7Z-pC0R#|8K%P^WjhUHE
zm=h!d5I|r7F)m&yDPArykN`jc0R`kagk%(eKt_lIC;|{bAOSuRIWQ360}22H5J-SY
z5+WeU1QY-WAdmn9i=c$Gw1glF15f}UfPezB@{FR~?Cjj4jPkOIiU0uwwuOh0pOuxL
zkq2Z8KmdURWaZ@<n3x#kK?)QB0toC<Sy_<NWkGyJfB<5E_&`<`!c|lR2rvLJUll8t
S^jy^d0000<MNUMnLSTZbjzjeT

literal 0
HcmV?d00001

diff --git a/widgets/login_info/skins/default/images/ssl.png b/widgets/login_info/skins/default/images/ssl.png
new file mode 100644
index 0000000000000000000000000000000000000000..330eb4e67c045b6b5c1c0df8862581ba4ba692e2
GIT binary patch
literal 1171
zcma)52UC-25Pm~ZPR7&msy8=x%!oI0H%F1CbOND7NQBUW3Pg}1y@cKZ2vP(o3W%to
zSCJMV6p4@!h?EdW2%XS-2uKIHFaO|nX7|}=cXoDnb~e!zZFu?8Z<hc7myt#Y41`yO
zzJw@bvz`9<8G`S8jBNY?ko-ZYFp!(~D-;xSfurC6)TV}?m}Np-%Fzge0wDAz0EAco
zj?N)m1t35kfHfQdYB>P>;+<hnGXOvon3`DVPpy=WFXuORr%(r~dRbLuMi`k9Lgys4
z_r)9>@;g}(^`!h3dU`iIeq=6vcW+g&yRgpZLaC9-CiY}&SAY5NIEBSarVSR2%~Cj1
zZ3CRf!y`clqmagqBQt_~hRSQ((`bW*yv5=5t+6e^Y;}Fk1dq<&;gOqbPS1|>s_>8_
zBO@a#D=Q}_CoeC5>((s=1qDS#MI|LAWo2a*6_wk!Z{N9dM^#l-O-)T*U0p*%LsL^z
zOG`^zTU$p*2M&kp>gww0=^+pZeSLic0|P@tLn9+2BocY|?p<SJV-ph-6bgk#qwn3j
zXKHF{W@d)LV9d?UEi5c7EiJ9AtgNlAu~@8)jm`c0_a8iX@bKY7TU%Q@J3D)OdmIk;
z=+Pqw2M0$-$H$K!J2^QyJ3G6$xVXByK6&!Q&CSi--QB~(!_(8#%gf8#+uO&-$Jf`_
z&(F`_-ye_12LuEJ1_lNN1qBBOhlGTLhK7cPg@uQQM?^$KMn*<OMG**u=;-K}n3&ku
z*r!jQ#>K_O$HzZ=_ADVGAu%yADJdyAIr;hX=P4;Esi~<iUc5+4OG{5r&&bHg%*=fG
z^5v^nud=eTva_>ua&lh3ew~|}`{vD?yu7@(Z{NOq_wN1s_e3HwKR>^qprEj@u&Ai0
zxVX5aq@=X8w5+VGyu7@kqN1|0vZ|`;!-o&m)zu$AeypjfsjaQ8tE;Q8uWx8*AdyIo
zjg3uBP0h{CWHPy>rKPpCwXLnKy}kX@r%xRn9TW=X^XJc<ot<4>T~sQSMx%9ichl+g
zo}QlG-d+ZS@#V{xzP`Tx{{Df1fx*E+CX+cdG{j=DhKGkoMn>3dHiyF*9UbLzxnpBv
z<KyEK6BCn@lT%Yu)6>&4Gc&WZvpgPeZf<UVetuzLVR3PBX=!PBd3j}JWp#CRZEbCR
zeSKqNV{>zJYio<o=WlOs3j~6lot@p?-LGH2?(OaE@9!TR92_1V9vvMWA0MBboSdGX
zo}Hb2`}Xbp{Ct#X;R^kY3?73vhv@$nP|TM+g9@og1l%Hc+<^%b^^_vi0FeY(rxS<e
zz~L-isDp_}NE2oLxgjlG^lypyHJF4{4d@`mSF|)hN6St9UI)O$8=NeQum~(6T%V{4
zU}D#<{+PwYi0u3%9W5fHxLKwMOvUa35$J$uu^g^Vba;rY)?Y#j6IUW#U&NBQ&D858
z<p4Yok?@ebazp*1+@CkD^mq!ZnIjx$2ON%d;cup}xv{b`96c%~2oR1rCyGKzSQ}oH
Zq5#X*-|aaKr?${O0I82gRO{km{sZBhaCQIy

literal 0
HcmV?d00001

diff --git a/widgets/login_info/skins/default/js/login.js b/widgets/login_info/skins/default/js/login.js
index 9ee9694d4..07fd10c65 100644
--- a/widgets/login_info/skins/default/js/login.js
+++ b/widgets/login_info/skins/default/js/login.js
@@ -11,12 +11,6 @@ function doFocusUserId(fo_id) {
 
 /* 로그인 후 */
 function completeLogin(ret_obj, response_tags, params, fo_obj) {
-    if(fo_obj.remember_user_id && fo_obj.remember_user_id.checked) {
-        var expire = new Date();
-        expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-        xSetCookie('user_id', fo_obj.user_id.value, expire);
-    }
-
     var url =  current_url.setQuery('act','');
     location.href = url;
 }
@@ -28,4 +22,18 @@ function completeOpenIDLogin(ret_obj, response_tags) {
 }
 
 
-
+/* 오픈 아이디 폼 변환 */
+function toggleLoginForm(obj) {
+    if(xGetElementById('login').style.display != "none") {
+        xGetElementById('login').style.display = "none";
+        xGetElementById('openid_login').style.display = "block";
+        xGetElementById('use_open_id_2').checked = true;
+        xGetElementById('fo_openid_login_widget').user_id.focus();
+    } else {
+        xGetElementById('openid_login').style.display = "none";
+        xGetElementById('login').style.display = "block";
+        xGetElementById('use_open_id').checked = false;
+        xGetElementById('use_open_id_2').checked = false;
+        xGetElementById('fo_login_widget').user_id.focus();
+    }
+}
diff --git a/widgets/login_info/skins/default/login_form.html b/widgets/login_info/skins/default/login_form.html
index 0bcf8e655..c56895a13 100644
--- a/widgets/login_info/skins/default/login_form.html
+++ b/widgets/login_info/skins/default/login_form.html
@@ -12,40 +12,52 @@
     xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
 </script>
 
-<div class="box_login fc_01" id="box_login">
-  <form action="./" method="get" onsubmit="return procFilter(this, widget_login)" id="fo_login_widget">
-      <div class="form_field">
-            <div>
-                <input name="user_id" type="text" class="input" id="login_form_user_id" />
-            </div>
-            <div>
-                <input name="password" type="password" class="input" />
-            </div>
-      </div>
+<div class="default_login" id="login">
+    <form action="./" method="post" onsubmit="return procFilter(this, widget_login)" id="fo_login_widget">
 
-      <div><input type="submit" value=" " class="submit" /></div>
-      <ul class="option">
-        <li><input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/></li>
-        <li><label for="keepid">{$lang->keep_signed}</label></li>
-      </ul>
-      <ul class="extra_option">
-        <li><a href="{getUrl('act','dispMemberSignUpForm')}" class="fc_02 btn">{$lang->cmd_signup}</a></li>
-        <li><a href="{getUrl('act','dispMemberFindAccount')}" class="fc_02 btn">{$lang->cmd_find_member_account}</a></li>
-      </ul>
-  </form>
-  <div class="clear"></div>
+        <div class="form_field">
+            <input name="user_id" type="text" class="input" id="login_form_user_id" />
+            <input name="password" type="password" class="input" />
+        </div>
+        <input type="submit" value=" " class="submit" />
+
+        <!--@if($member_config->enable_ssl=='Y')-->
+        <p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
+            <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
+        </p>
+        <!--@end-->
+
+        <p>
+            <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
+            <label for="keepid">{$lang->keep_signed}</label>
+        </p>
+
+        <!--@if($member_config->enable_openid=='Y')-->
+        <p>
+            <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;"/>
+            <label for="use_open_id">Open ID</label>
+        </p>
+        <!--@end-->
+
+        <ul class="extra_option">
+            <li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
+            <li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
+        </ul>
+    </form>
+    <div class="clear"></div>
 </div>
 
 <!-- OpenID -->
 <!--@if($member_config->enable_openid=='Y')-->
-<div class="openid_login fc_01" id="box_login">
-  <form action="./" method="post" onsubmit="return procFilter(this, openid_login)" >
-      <div class="wButtonWrite">
-        <ul>
-          <li><input type="text" name="user_id" class="openid_user_id" /></li>
-          <li><span class="wButtonTypeA"><img src="./images/blank.gif" alt="" class="leftCap" /><input type="submit" value="{$lang->cmd_login}" accesskey="s" /><img src="./images/blank.gif" alt="" class="rightCap" /></span></li>
-        </ul>
-      </div>
+<div class="default_login openid_login" id="openid_login">
+    <form action="./" method="post" onsubmit="return procFilter(this, openid_login)" id="fo_openid_login_widget">
+        <div class="form_field">
+            <div class="openIDTitle">
+                OpenID <input name="use_open_id_2" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" checked="true"/>
+            </div>
+            <input type="text" name="user_id" class="input" />
+        </div>
+        <input type="submit" value=" " class="submit" />
   </form>
 </div>
 <!--@end-->
diff --git a/widgets/login_info/skins/default/login_info.html b/widgets/login_info/skins/default/login_info.html
index 4eb83e653..03ed20991 100644
--- a/widgets/login_info/skins/default/login_info.html
+++ b/widgets/login_info/skins/default/login_info.html
@@ -1,13 +1,17 @@
 <!-- colorset의 값에 따라 css 파일을 import 한다 -->
-<!--@if($colorset=="default"||!$colorset)-->
+<!--@if(!$colorset)-->
+    {@ $colorset = "default"}
+<!--@end-->
+
+<!--@if($colorset=="default")-->
     <!--%import("css/default.css")-->
 <!--@end-->
 
 <!--%import("./filter/logout.xml")-->
-<div class="box_login">
-    <div class="user_info">
-        <div class="fl"><div class="member_{$logged_info->member_srl} fl fc_01">{$logged_info->nick_name}</div></div>
-        <div class="fr tRight"><a href="{getUrl('act','dispMemberLogout')}" class="button"><span>{$lang->cmd_logout}</span></a></div>
+<div class="default_login">
+    <div class="loginUser">
+        <div class="userNickName"><div class="member_{$logged_info->member_srl}">{$logged_info->nick_name}</div></div>
+        <a href="{getUrl('act','dispMemberLogout')}" class="logoutButton"><img src="./images/{$colorset}/logout_btn.gif" alt="{$lang->cmd_logout}" /></a>
     </div>
 
     <div class="hr_dot_01"></div>
@@ -18,5 +22,5 @@
     <!--@if($logged_info->is_admin=="Y")-->
     <div class="item administrative"><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></div>
     <!--@end-->
-    <div class="item lastlogin fc_02">{$lang->last_login} : {zDate($logged_info->last_login, "Y-m-d H:i")}</div>
+    <div class="lastlogin">{$lang->last_login} : {zDate($logged_info->last_login, "Y-m-d H:i")}</div>
 </div>
diff --git a/widgets/login_info/skins/xe_official/css/black.css b/widgets/login_info/skins/xe_official/css/black.css
index 6de1cf77a..5e122844e 100644
--- a/widgets/login_info/skins/xe_official/css/black.css
+++ b/widgets/login_info/skins/xe_official/css/black.css
@@ -6,6 +6,13 @@
 .login_black form .idpw { float:left; width:110px;}
 .login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
 .login_black form .login { float:right;}
+
+.login_black form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
+.login_black form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+.login_black form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+.login_black form p.noneSSL a { color:#BF6801; text-decoration:none; }
+.login_black form p.SSL a { color:#9CAC74; text-decoration:none; }
+
 .login_black form p.save { margin:0; clear:both; padding:.3em 0;}
 .login_black form p.save input { vertical-align:middle; _margin:-3px;}
 *:first-child+html body#black .login_black form p input { margin:-3px; }
diff --git a/widgets/login_info/skins/xe_official/css/default.css b/widgets/login_info/skins/xe_official/css/default.css
index 5d7bbb62c..6abc39049 100644
--- a/widgets/login_info/skins/xe_official/css/default.css
+++ b/widgets/login_info/skins/xe_official/css/default.css
@@ -6,6 +6,13 @@
 .login_default form .idpw { float:left; width:110px; }
 .login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
 .login_default form .login { float:right;}
+
+.login_default form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
+.login_default form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+.login_default form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+.login_default form p.noneSSL a { color:#BF6801; text-decoration:none; }
+.login_default form p.SSL a { color:#9CAC74; text-decoration:none; }
+
 .login_default form p.save { margin:0; clear:both; padding:.3em 0;}
 .login_default form p.save input { vertical-align:middle; _margin:-3px;}
 *:first-child+html body .login_default form p input { margin:-3px; }
diff --git a/widgets/login_info/skins/xe_official/css/white.css b/widgets/login_info/skins/xe_official/css/white.css
index 148e5fc0d..56e2951b8 100644
--- a/widgets/login_info/skins/xe_official/css/white.css
+++ b/widgets/login_info/skins/xe_official/css/white.css
@@ -6,6 +6,13 @@
 .login_white form .idpw { float:left; width:110px;}
 .login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
 .login_white form .login { float:right;}
+
+.login_white form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
+.login_white form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+.login_white form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+.login_white form p.noneSSL a { color:#BF6801; text-decoration:none; }
+.login_white form p.SSL a { color:#9CAC74; text-decoration:none; }
+
 .login_white form p.save { margin:0; clear:both; padding:.3em 0;}
 .login_white form p.save input { vertical-align:middle; _margin:-3px;}
 *:first-child+html body#white .login_white form p input { margin:-3px; }
diff --git a/widgets/login_info/skins/xe_official/images/none_ssl.png b/widgets/login_info/skins/xe_official/images/none_ssl.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7561bfc406031553257c5750f5429174d66c468
GIT binary patch
literal 1152
zcmV-`1b_R9P)<h;3K|Lk000e1NJLTq000mG000dL0{{R3mt`In00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ<08mU+Magk(>ynS`nwR?M=jeTS=zDhh>FDNZW6Xzz
z&61Gz*w^Q6XUcbT_0!Vy%E{?~e9n}T=WlB8wzT`~?ChPJ=y`Pb-{1ZC_vdV8=y-GW
z($VK@W$mJ$xwx?V?d`8mO6{PXxwx<*A|fLrBP1jwB_$;$CMG8*CnzW=DJdx`Dk>{0
zD=aK5EiElBE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*
zJv}`>K0ZG`KR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)Ts
zPEJoxPf$=$QBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~c
zUtnNhVPRonVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvM
zadB~Sa&mKXb98icb#--ic6N7ncX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7
zf`WsCgM@^Hg@uKNhK7fShlq%XiHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?
zla!Q{m6es2mX?>7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyy
zrKP2&rlzN-r>Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9aj
zwzjvox45{txw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T
z$H>UY$;rve%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D
z+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}
z>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(
z`~3X;{r&y^{{H{}{~}16mjD0&B6LztQ~&?}|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0
z|NsC0|Nj6D(8F;6006v6L_t(|+G0=y19>2TumA#x0m2m!7Z-pC0R#|8K%P^WjhUHE
zm=h!d5I|r7F)m&yDPArykN`jc0R`kagk%(eKt_lIC;|{bAOSuRIWQ360}22H5J-SY
z5+WeU1QY-WAdmn9i=c$Gw1glF15f}UfPezB@{FR~?Cjj4jPkOIiU0uwwuOh0pOuxL
zkq2Z8KmdURWaZ@<n3x#kK?)QB0toC<Sy_<NWkGyJfB<5E_&`<`!c|lR2rvLJUll8t
S^jy^d0000<MNUMnLSTZbjzjeT

literal 0
HcmV?d00001

diff --git a/widgets/login_info/skins/xe_official/images/ssl.png b/widgets/login_info/skins/xe_official/images/ssl.png
new file mode 100644
index 0000000000000000000000000000000000000000..330eb4e67c045b6b5c1c0df8862581ba4ba692e2
GIT binary patch
literal 1171
zcma)52UC-25Pm~ZPR7&msy8=x%!oI0H%F1CbOND7NQBUW3Pg}1y@cKZ2vP(o3W%to
zSCJMV6p4@!h?EdW2%XS-2uKIHFaO|nX7|}=cXoDnb~e!zZFu?8Z<hc7myt#Y41`yO
zzJw@bvz`9<8G`S8jBNY?ko-ZYFp!(~D-;xSfurC6)TV}?m}Np-%Fzge0wDAz0EAco
zj?N)m1t35kfHfQdYB>P>;+<hnGXOvon3`DVPpy=WFXuORr%(r~dRbLuMi`k9Lgys4
z_r)9>@;g}(^`!h3dU`iIeq=6vcW+g&yRgpZLaC9-CiY}&SAY5NIEBSarVSR2%~Cj1
zZ3CRf!y`clqmagqBQt_~hRSQ((`bW*yv5=5t+6e^Y;}Fk1dq<&;gOqbPS1|>s_>8_
zBO@a#D=Q}_CoeC5>((s=1qDS#MI|LAWo2a*6_wk!Z{N9dM^#l-O-)T*U0p*%LsL^z
zOG`^zTU$p*2M&kp>gww0=^+pZeSLic0|P@tLn9+2BocY|?p<SJV-ph-6bgk#qwn3j
zXKHF{W@d)LV9d?UEi5c7EiJ9AtgNlAu~@8)jm`c0_a8iX@bKY7TU%Q@J3D)OdmIk;
z=+Pqw2M0$-$H$K!J2^QyJ3G6$xVXByK6&!Q&CSi--QB~(!_(8#%gf8#+uO&-$Jf`_
z&(F`_-ye_12LuEJ1_lNN1qBBOhlGTLhK7cPg@uQQM?^$KMn*<OMG**u=;-K}n3&ku
z*r!jQ#>K_O$HzZ=_ADVGAu%yADJdyAIr;hX=P4;Esi~<iUc5+4OG{5r&&bHg%*=fG
z^5v^nud=eTva_>ua&lh3ew~|}`{vD?yu7@(Z{NOq_wN1s_e3HwKR>^qprEj@u&Ai0
zxVX5aq@=X8w5+VGyu7@kqN1|0vZ|`;!-o&m)zu$AeypjfsjaQ8tE;Q8uWx8*AdyIo
zjg3uBP0h{CWHPy>rKPpCwXLnKy}kX@r%xRn9TW=X^XJc<ot<4>T~sQSMx%9ichl+g
zo}QlG-d+ZS@#V{xzP`Tx{{Df1fx*E+CX+cdG{j=DhKGkoMn>3dHiyF*9UbLzxnpBv
z<KyEK6BCn@lT%Yu)6>&4Gc&WZvpgPeZf<UVetuzLVR3PBX=!PBd3j}JWp#CRZEbCR
zeSKqNV{>zJYio<o=WlOs3j~6lot@p?-LGH2?(OaE@9!TR92_1V9vvMWA0MBboSdGX
zo}Hb2`}Xbp{Ct#X;R^kY3?73vhv@$nP|TM+g9@og1l%Hc+<^%b^^_vi0FeY(rxS<e
zz~L-isDp_}NE2oLxgjlG^lypyHJF4{4d@`mSF|)hN6St9UI)O$8=NeQum~(6T%V{4
zU}D#<{+PwYi0u3%9W5fHxLKwMOvUa35$J$uu^g^Vba;rY)?Y#j6IUW#U&NBQ&D858
z<p4Yok?@ebazp*1+@CkD^mq!ZnIjx$2ON%d;cup}xv{b`96c%~2oR1rCyGKzSQ}oH
Zq5#X*-|aaKr?${O0I82gRO{km{sZBhaCQIy

literal 0
HcmV?d00001

diff --git a/widgets/login_info/skins/xe_official/js/login.js b/widgets/login_info/skins/xe_official/js/login.js
index 171e43531..7e44a5637 100644
--- a/widgets/login_info/skins/xe_official/js/login.js
+++ b/widgets/login_info/skins/xe_official/js/login.js
@@ -11,12 +11,6 @@ function doFocusUserId(fo_id) {
 
 /* 로그인 후 */
 function completeLogin(ret_obj, response_tags, params, fo_obj) {
-    if(fo_obj.remember_user_id && fo_obj.remember_user_id.checked) {
-        var expire = new Date();
-        expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-        xSetCookie('user_id', fo_obj.user_id.value, expire);
-    }
-
     var url =  current_url.setQuery('act','');
     location.href = url;
 }
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index a468d364c..0b1340a8e 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -18,7 +18,7 @@
 
 <fieldset id="login" class="login_{$colorset}">
 <legend>{$lang->cmd_login}</legend>
-<form action="./" method="get" onsubmit="return procFilter(this, widget_login)" id="fo_login_widget">
+<form action="./" method="post" onsubmit="return procFilter(this, widget_login)" id="fo_login_widget">
 
     <div class="idpwWrap">
         <div class="idpw">
@@ -27,11 +27,15 @@
         </div>
         <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
     </div>
+    <!--@if($member_config->enable_ssl=='Y')-->
+    <p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
+        <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
+    </p>
+    <!--@end-->
     <p class="save">
         <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
         <label for="keepid">{$lang->keep_signed}</label>
 
-
         <!--@if($member_config->enable_openid=='Y')-->
         <br />
         <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;"/>

From f4cde766836379a254e0d2a480c9dbd209b4143d Mon Sep 17 00:00:00 2001
From: wdlee91 <wdlee91@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 16 Apr 2008 08:53:43 +0000
Subject: [PATCH 014/111] =?UTF-8?q?getRequestUri():=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=ED=86=A0=EC=BD=9C=EB=AA=85=EC=9D=84=20=EC=86=8C=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=EB=A1=9C=20=EB=A6=AC=ED=84=B4=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
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@4110 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 77f3bf9d9..241cb7b27 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -636,7 +636,7 @@
                         $use_ssl = false;
                     break;
             }
-            return sprintf("%s://%s%s",$use_ssl?'HTTPS':'HTTP',$_SERVER['HTTP_HOST'], getScriptPath());
+            return sprintf("%s://%s%s",$use_ssl?'https':'http',$_SERVER['HTTP_HOST'], getScriptPath());
         }
 
         /**

From 9650a4a22b4bd84100578d82ea6da0c9327029a9 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 Apr 2008 09:33:49 +0000
Subject: [PATCH 015/111] =?UTF-8?q?#452=20=EC=84=A4=EB=AC=B8=EC=A1=B0?=
 =?UTF-8?q?=EC=82=AC=20=EC=97=90=EB=94=94=ED=84=B0=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=EB=A1=9C=20=EC=84=A4=EB=AC=B8=EC=A1=B0?=
 =?UTF-8?q?=EC=82=AC=20=EC=B6=94=EA=B0=80=EC=8B=9C=20=EC=8A=A4=ED=82=A8?=
 =?UTF-8?q?=EC=9D=84=20=EC=84=A0=ED=83=9D=ED=95=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD.=20simple=EC=84=A4?=
 =?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=20=EC=8A=A4=ED=82=A8=20=EC=B6=94?=
 =?UTF-8?q?=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@4111 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../poll_maker/poll_maker.class.php           |   9 +-
 .../components/poll_maker/tpl/popup.css       |  15 +++-
 .../components/poll_maker/tpl/popup.html      |  83 ++++++++++--------
 .../editor/components/poll_maker/tpl/popup.js |   9 +-
 modules/poll/poll.controller.php              |  23 ++---
 modules/poll/poll.model.php                   |  20 ++---
 modules/poll/skins/default/form.html          |   5 +-
 modules/poll/skins/default/js/poll.js         |   5 +-
 modules/poll/skins/simple/css/.poll.css.swp   | Bin 0 -> 12288 bytes
 modules/poll/skins/simple/css/poll.css        |  26 ++++++
 modules/poll/skins/simple/filter/poll.xml     |  10 +++
 modules/poll/skins/simple/form.html           |  61 +++++++++++++
 .../poll/skins/simple/images/color_bar.png    | Bin 0 -> 328 bytes
 modules/poll/skins/simple/js/poll.js          |  64 ++++++++++++++
 modules/poll/skins/simple/result.html         |  36 ++++++++
 modules/poll/skins/simple/skin.xml            |  16 ++++
 16 files changed, 303 insertions(+), 79 deletions(-)
 create mode 100644 modules/poll/skins/simple/css/.poll.css.swp
 create mode 100644 modules/poll/skins/simple/css/poll.css
 create mode 100644 modules/poll/skins/simple/filter/poll.xml
 create mode 100644 modules/poll/skins/simple/form.html
 create mode 100755 modules/poll/skins/simple/images/color_bar.png
 create mode 100644 modules/poll/skins/simple/js/poll.js
 create mode 100644 modules/poll/skins/simple/result.html
 create mode 100644 modules/poll/skins/simple/skin.xml

diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php
index dda44c901..f4e9d5336 100644
--- a/modules/editor/components/poll_maker/poll_maker.class.php
+++ b/modules/editor/components/poll_maker/poll_maker.class.php
@@ -23,6 +23,11 @@
          * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
          **/
         function getPopupContent() {
+            // 설문조사 스킨을 구함
+            $oModuleModel = &getModel('module');
+            $skin_list = $oModuleModel->getSkins("./modules/poll/");
+            Context::set('skin_list', $skin_list);
+
             // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
             $tpl_path = $this->component_path.'tpl';
             $tpl_file = 'popup.html';
@@ -39,6 +44,8 @@
          **/
         function transHTML($xml_obj) {
             $poll_srl = $xml_obj->attrs->poll_srl;
+            $skin = $xml_obj->attrs->skin;
+            if(!$skin) $skin = 'default';
 
             preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
             $width = $matches[2];
@@ -47,7 +54,7 @@
 
             // poll model 객체 생성해서 html 얻어와서 return
             $oPollModel = &getModel('poll');
-            return $oPollModel->getPollHtml($poll_srl, $style);
+            return $oPollModel->getPollHtml($poll_srl, $style, $skin);
         }
     }
 ?>
diff --git a/modules/editor/components/poll_maker/tpl/popup.css b/modules/editor/components/poll_maker/tpl/popup.css
index a85f967ec..43eb2c09a 100644
--- a/modules/editor/components/poll_maker/tpl/popup.css
+++ b/modules/editor/components/poll_maker/tpl/popup.css
@@ -1,8 +1,19 @@
 @charset "utf-8";
 @import url(../../../../../modules/admin/tpl/css/admin.css);
 
-.pollButton { clear:both; margin:.5em 0 0 0; height:20px; }
-.pollButton label { vertical-align:middle; color:#888888; }
+.display_date { cursor:pointer; width:80px; float:left; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px; font-family:tahoma; }
+
+.adminTable { margin-bottom:0 !important; }
+
+.pollButton { clear:both; overflow:hidden; border:1px solid #E3E3E2; border-top:none; background-color:#FAF8F4; padding:4px; }
+.pollButton .fl { padding:5px 0 0 10px; color:#AAAAAA; }
+.pollButton .fl label { vertical-align:middle; color:#888888; }
+.pollButton .fr { padding:5px 10px 0 0; color:#AAAAAA; }
+.pollButton .fr a { color:#444444; text-decoration:none; font-weight:bold;}
+.pollButton .fr a.delPoll { color:red; font-weight:normal;}
 
 li { list-style:none; margin-right:5px; float:left; color:#666666}
 li a { text-decoration:none; color:#666666;}
+
+#popFooter .fl { margin-left:10px; }
+#popFooter .fr { margin-right:10px; }
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index d14b4f66c..4aa1b9675 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -3,6 +3,18 @@
 <!--%import("filter/insert_poll.xml")-->
 <!--%import("../lang")-->
 
+<!-- calendar -->
+<!--%import("../../../../../common/js/calendar.js",optimized=false)-->
+<!--@if($lang_type == 'ko')-->
+    <!--%import("../../../../../common/js/calendar-ko.js",optimized=false)-->
+<!--@else-->
+    <!--%import("../../../../../common/js/calendar-en.js",optimized=false)-->
+<!--@end-->
+<!--%import("../../../../../common/js/calendar-setup.js",optimized=false)-->
+<!--%import("../../../../../common/css/calendar-system.css",optimized=false)-->
+
+
+
 <script type="text/javascript">
     var msg_poll_cannot_modify = "{$lang->msg_poll_cannot_modify}";
 </script>
@@ -16,6 +28,7 @@
 <input type="hidden" name="method" value="insertPoll" />
 <input type="hidden" name="poll_srl" value="" />
 <input type="hidden" name="editor_sequence" value="{$editor_sequence}" />
+<input type="hidden" name="stop_date" id="stop_date" value="{date("Ymd",time()+60*60*24*30)}" />
 
     <div id="popBody">
 
@@ -25,30 +38,20 @@
         <tr>
             <th scope="row">{$lang->poll_stop_date}</th>
             <td>
-                <ul class="buttonLeft nospace">
-                    <li>
-                        <select name="stop_year">
-                            <!--@for($i=date("Y");$i<date("Y")+10;$i++)-->
-                            <option value="{$i}">{$i}</option>
-                            <!--@end-->
-                        </select>
-                    </li>
-                    <li>
-                        <select name="stop_month">
-                            <!--@for($i=1;$i<=12;$i++)-->
-                            <option value="{$i}" <!--@if($i==date("m", time()+60*60*24*30))-->selected="selected"<!--@end-->>{$i}</option>
-                            <!--@end-->
-                        </select>
-                    </li>
-                    <li>
-                        <select name="stop_day">
-                            <!--@for($i=1;$i<=31;$i++)-->
-                            <option value="{$i}" <!--@if($i==date("d", time()+60*60*24*30))-->selected="selected"<!--@end-->>{$i}</option>
-                            <!--@end-->
-                        </select>
-                    </li>
-                    <li><a href="#" onclick="doPollAdd(); return false;">{$lang->cmd_add_poll}</a></li>
-                </ul>
+                <div class="display_date" id="display_date">{date("Y-m-d",time()+60*60*24*30)}</div>
+                <script type="text/javascript">
+                    Calendar.setup( { firstDay : 0, inputField : "stop_date", ifFormat : "%Y%m%d", displayArea : "display_date", daFormat : "%Y-%m-%d"});
+                </script>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">{$lang->skin}</th>
+            <td>
+                <select name="skin">
+                    <!--@foreach($skin_list as $skin=>$skin_info)-->
+                    <option value="{$skin}">{$skin_info->title} (skin by {$skin_info->maker->name})</option>
+                    <!--@end-->
+                </select>
             </td>
         </tr>
         </table>
@@ -76,25 +79,29 @@
             </table>
 
             <div class="pollButton clear">
-                <ul class="fl">
-                    <li><a href="#" onclick="doPollAddItem(this); return false;">{$lang->cmd_add_item}</a></li>
-                </ul>
-                <ul class="fr">
-                    <li><a href="#" onclick="doPollDelete(this); return false;">{$lang->cmd_del_poll}</a></li>
-                </ul>
-                <ul class="fr">
-                    <li><label>{$lang->poll_chk_count}</label></li>
-                    <li><input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" /></li>
-                </ul>
+                <div class="fl">
+                    <label>{$lang->poll_chk_count}</label>
+                    <input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" />
+                </div>
+                <div class="fr">
+                    <a href="#" onclick="doPollDelete(this); return false;" class="delPoll">{$lang->cmd_del_poll}</a> |
+                    <a href="#" onclick="doPollAddItem(this); return false;">{$lang->cmd_add_item}</a>
+                </div>
+                <div class="clear"></div>
             </div>
         </div>
 
     </div>
 
-    <div id="popFooter" class="tCenter">
-        <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-        <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
+    <div id="popFooter" class="tCenter clear">
+        <div class="fl">
+            <a href="#" onclick="doPollAdd(); return false;" class="button"><span>{$lang->cmd_add_poll}</span></a>
+        </div>
+        <div class="fr">
+            <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
+            <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+            <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
+        </div>
     </div>
 
 
diff --git a/modules/editor/components/poll_maker/tpl/popup.js b/modules/editor/components/poll_maker/tpl/popup.js
index 8e3618100..80981a6bc 100644
--- a/modules/editor/components/poll_maker/tpl/popup.js
+++ b/modules/editor/components/poll_maker/tpl/popup.js
@@ -33,10 +33,13 @@ function setPoll() {
 function completeInsertPoll(ret_obj) {
     if(typeof(opener)=="undefined") return null;
 
+    var fo_obj = xGetElementById('fo_component');
+    var skin = fo_obj.skin.options[fo_obj.skin.selectedIndex].value;
+
     var poll_srl = ret_obj["poll_srl"];
     if(!poll_srl) return null;
 
-    var text = "<img src=\"./common/tpl/images/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" style=\"width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\"  />";
+    var text = "<img src=\"./common/tpl/images/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\"  />";
 
     alert(ret_obj['message']);
 
@@ -79,7 +82,7 @@ function doPollAdd() {
  * 항목 삭제
  **/
 function doPollDelete(obj) {
-    var pobj = obj.parentNode.parentNode.parentNode.parentNode;
+    var pobj = obj.parentNode.parentNode.parentNode;
     var tmp_arr = pobj.id.split('_');
     var index = tmp_arr[1];
     if(index==1) return;
@@ -103,7 +106,7 @@ function doPollDelete(obj) {
  * 새 항목 추가
  **/
 function doPollAddItem(obj) {
-    var tbl = xPrevSib(obj.parentNode.parentNode.parentNode);
+    var tbl = xPrevSib(obj.parentNode.parentNode);
     var tbody = tbl.lastChild;
     var tmp = tbody.firstChild;
     var source = null;
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index 3e75d95c1..9a4e049a4 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -24,12 +24,8 @@
             $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
             if(!$upload_target_srl) $upload_target_srl = getNextSequence();
 
-            $stop_year = Context::get('stop_year');
-            $stop_month = Context::get('stop_month');
-            $stop_day = Context::get('stop_day');
-
-            $stop_date = sprintf('%04d%02d%02d235959', $stop_year, $stop_month, $stop_day);
-            if($stop_date < date("YmdHis")) $stop_date = date("YmdHis", time()+60*60*24*365);
+            $stop_date = Context::get('stop_date');
+            if($stop_date < date("Ymd")) $stop_date = date("YmdHis", time()+60*60*24*365);
 
             $vars = Context::getRequestVars();
             foreach($vars as $key => $val) {
@@ -111,17 +107,6 @@
                 }
             }
 
-            // 작성자의 정보를 로그로 남김
-            /*
-            $log_args->poll_srl = $poll_srl;
-            $log_args->member_srl = $member_srl;
-            $output = executeQuery('poll.insertPollLog', $log_args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-            */
-            
             $oDB->commit();
 
             $this->add('poll_srl', $poll_srl);
@@ -198,9 +183,11 @@
          **/
         function procPollViewResult() {
             $poll_srl = Context::get('poll_srl'); 
+            $skin = Context::get('skin'); 
+            if(!$skin || !is_dir('./modules/poll/skins/'.$skin)) $skin = 'default';
 
             $oPollModel = &getModel('poll');
-            $tpl = $oPollModel->getPollResultHtml($poll_srl);
+            $tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
 
             $this->add('poll_srl', $poll_srl);
             $this->add('tpl',$tpl);
diff --git a/modules/poll/poll.model.php b/modules/poll/poll.model.php
index 0f137e9ab..a5c07f0b3 100644
--- a/modules/poll/poll.model.php
+++ b/modules/poll/poll.model.php
@@ -17,7 +17,6 @@
          * @brief 이미 설문 조사를 하였는지 검사하는 함수
          **/
         function isPolled($poll_srl) {
-
             $args->poll_srl = $poll_srl;
 
             if(Context::get('is_logged')) {
@@ -35,7 +34,7 @@
          * @brief 설문조사의 html데이터를 return
          * 설문조사에 응하였는지에 대한 체크를 한 후 결과를 return
          **/
-        function getPollHtml($poll_srl, $style = '') {
+        function getPollHtml($poll_srl, $style = '', $skin = 'default') {
 
             $args->poll_srl = $poll_srl;
 
@@ -64,7 +63,7 @@
             $poll->poll_srl = $poll_srl;
 
             // 종료일이 지났으면 무조건 결과만
-            if($poll->stop_date > date("YmdHis")) {
+            if($poll->stop_date > date("Ymd")) {
                 if($this->isPolled($poll_srl)) $tpl_file = "result";
                 else $tpl_file = "form";
             } else {
@@ -72,13 +71,10 @@
             }
 
             Context::set('poll',$poll);
+            Context::set('skin',$skin);
 
             // 기본 설정의 스킨, 컬러셋 설정 
-            $oModuleModel = &getModel('module');
-            $poll_config = $oModuleModel->getModuleConfig('poll');
-            if(!$poll_config->skin) $poll_config->skin = 'default';
-            Context::set('poll_config', $poll_config);
-            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $poll_config->skin);
+            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
 
             $oTemplate = &TemplateHandler::getInstance();
             return $oTemplate->compile($tpl_path, $tpl_file);
@@ -87,7 +83,7 @@
         /**
          * @brief 결과 html을 return
          **/
-        function getPollResultHtml($poll_srl) {
+        function getPollResultHtml($poll_srl, $skin = 'default') {
             $args->poll_srl = $poll_srl;
 
             // 해당 설문조사에 대한 내용을 조사
@@ -119,11 +115,7 @@
             Context::set('poll',$poll);
 
             // 기본 설정의 스킨, 컬러셋 설정 
-            $oModuleModel = &getModel('module');
-            $poll_config = $oModuleModel->getModuleConfig('poll');
-            if(!$poll_config->skin) $poll_config->skin = 'default';
-            Context::set('poll_config', $poll_config);
-            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $poll_config->skin);
+            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
 
             $oTemplate = &TemplateHandler::getInstance();
             return $oTemplate->compile($tpl_path, $tpl_file);
diff --git a/modules/poll/skins/default/form.html b/modules/poll/skins/default/form.html
index afdd700ce..aa9ee465d 100644
--- a/modules/poll/skins/default/form.html
+++ b/modules/poll/skins/default/form.html
@@ -11,6 +11,7 @@
     <form action="./" method="get" onsubmit="return doPoll(this)">
     <input type="hidden" name="poll_srl" value="{$poll->poll_srl}" />
     <input type="hidden" name="poll_srl_indexes" value="" />
+    <input type="hidden" name="skin" value="{$skin}" />
 
     <table cellspacing="0" class="poll_table">
     <col width="7" />
@@ -23,7 +24,7 @@
     </tr>
     <tr>
         <td class="title" colspan="3">
-            {$lang->poll_stop_date} : <strong>{zdate($poll->stop_date, "Y-m-d")}</strong> {zdate($poll->stop_date, "H:i")}
+            {$lang->poll_stop_date} : <strong>{zdate($poll->stop_date, "Y-m-d")}</strong>
         </td>
     </tr>
     <tr>
@@ -66,7 +67,7 @@
     <tr>
         <td colspan="3" class="poll_button">
             <div>
-                <span class="button"><input type="button" value="{$lang->cmd_view_result}" class="poll_button" onclick="doPollViewResult('{$poll->poll_srl}'); return false;"/></span>
+                <span class="button"><input type="button" value="{$lang->cmd_view_result}" class="poll_button" onclick="doPollViewResult('{$poll->poll_srl}','{$skin}'); return false;"/></span>
                 <span class="button"><input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" /></span>
             </div>
         </td>
diff --git a/modules/poll/skins/default/js/poll.js b/modules/poll/skins/default/js/poll.js
index 14e0bb3e7..5c359e814 100644
--- a/modules/poll/skins/default/js/poll.js
+++ b/modules/poll/skins/default/js/poll.js
@@ -51,10 +51,13 @@ function completePoll(ret_obj) {
 }
 
 /* 설문 미리 보기 */
-function doPollViewResult(poll_srl) {
+function doPollViewResult(poll_srl, skin) {
     var params = new Array();
     params['poll_srl'] = poll_srl;
 
+    if(typeof(skin)=='undefined') skin = 'default';
+    params['skin'] = skin;
+
     var response_tags = new Array('error','message','poll_srl', 'tpl');
 
     exec_xml('poll','procPollViewResult', params, completePoll, response_tags);
diff --git a/modules/poll/skins/simple/css/.poll.css.swp b/modules/poll/skins/simple/css/.poll.css.swp
new file mode 100644
index 0000000000000000000000000000000000000000..ec18e38c6d63bd09af67b007acebc5f6872d9de5
GIT binary patch
literal 12288
zcmeI2%We}%6oxBEh|5eE1UptWL@eEICnBKs1{lb|0tq2O*hPIQJ4M=EO?Nq%L>VD5
zGt!9L4i-ECmp!}y5)Z(Nd4!pHgc1DJx7cwL!y=JDr&@nH?(RD0udhy(t;C*v{nBNA
z%4#vR!;D$)_Fmk3<}Y^DVr)$$%3Pk*RHq|-G3hDBelr1^i;IiRHE$rAJr(prkv3x$
zhRt+EMrkvZy*Lz2Kh3XN_+@ffdV&ZLfk_1Vy3;s4&E{rX_RR60`OzcSCiS5EM1Tko
z0U|&IhyW2F0z`lad}jo7JjFg@OnabX&{QFus1X4oKm>>Y5g-CYfCvx)B0vO)01+Sp
z-w6RXVC>*Q#{PuN|NqV30N(t>*lXw!<UuYp1-(7Q*c0dmGy@%n-cK|37`h1k3jO^f
zV^5(c&^+|$2gV*k51=d1|H$*9$oB`%zeD$+Y3S7f#$G}%py$v6^madEx1j&_F}4ET
zgs2e#B0vO)01^1M2w3?S+?LE&-nb4dUqxC(nrqh!g(bD<EqQLTl)W_fQ|;=0%2S=F
zsLR)R2hTTd3)x-Pj;F$)&3zTB#F;sH`WL&^YV!@YT?)Y3?)EM?5Y|q3*ol~5MRpeq
zAjRirFOaKw^=L8BUr;V~*4lYJb=;l|?>PTFzQ5xM{(W}0NSewu;k0JsL7Uf%%k#MG
znS#G91HJ6DZ2Lr;FXweXZ~AyD2}IKHl-8=}wBi9zRVV{KbK#^p>J|cGu9q=RnHb}1
zWhb&CsptAD-9+`HpiwN>g?SusSq!PLGmhWv6H8tngN(Q}`~pEU0wY7eU>ewrr8}Fo
zYO`3#S}_qLyGiT@fsDFY)Hy&kU~#UD&f4|hMy;75Y`CH9MouU?x|%Jm;$gq%vexFj
z$l5UXO}3435Gn4RceUUycoq=LQDx}@;j6^eQbkUrB2hQHRg85$<S;RtX@#bYS=85O
z98WgPE$rjx)PR>;_&SeODl>nshg$7xc+7G;cAJ|#IE_{0W*CIS$a`+ml~E(_hgD%_
zqqt^5)R%P?r0Q>G1&hk`u3RM|1in?cDvGk4>#c7YJlkowjN-noEE)G@@zf8*yt!@8
z-Ta(6O7mvcxs4<DRD;1^7XFHlC1g@=ng5!{wbY^5d~#&F8!7mjzQ*Wzxr*M~7r_ws
zY>AY^&&QJeG&8ytpH+GrufcIMsG4F$0&1QxuanWJC}{Hmq7k}xR9`zCIS}}0FuZpT
Mg()_UY?W-VPoOt3CjbBd

literal 0
HcmV?d00001

diff --git a/modules/poll/skins/simple/css/poll.css b/modules/poll/skins/simple/css/poll.css
new file mode 100644
index 000000000..c4a94464b
--- /dev/null
+++ b/modules/poll/skins/simple/css/poll.css
@@ -0,0 +1,26 @@
+.simple_poll { table-layout:fixed; width:100%; padding:0; border:none;}
+
+.simple_poll td { padding:0; margin:0; }
+.simple_poll td.title { text-align:right; }
+
+.simple_poll td .itemDiv { border-top:1px solid #BBBBBB; margin-top:3px; padding:3px 0 3px 0; }
+.simple_poll td .title { color:#000000; font-weight:bold; }
+.simple_poll td .checkcount { color:#AAAAAA; }
+.simple_poll td .item { color:#636363; margin:3px 0 0 10px; }
+.simple_poll td .item input { margin:0; padding:0; }
+
+.simple_poll td .barBox { margin-left:10px; position:relative; height:20px; }
+.simple_poll td .barBox .bar { margin-right:100px; margin-top:7px; }
+.simple_poll td .barBox .status { position:absolute; right:0; top:0; }
+
+.simple_poll td.stopDate { text-align:right; color:#AAAAAA; border-top:1px solid #BBBBBB; padding-top:3px;}
+.simple_poll td.stopDate a { color:#AAAAAA; text-decoration:none; }
+
+.simple_poll td.poll_button { text-align:left; border-top:1px solid #BBBBBB;  padding-top:3px;}
+.simple_poll td.poll_button .poll_button { border:1px solid #EEEEEE; background-color:#AAAAAA; color:#FFFFFF; font-weight:bold; padding:1px 3px 1px 3px; height:20px; }
+
+
+.simple_poll td.b { background-color:#F6F6F5; height:7px; }
+.simple_poll td.b img { width:100%; height:6px; border-bottom:1px solid #E5E5E5; }
+.simple_poll td.bb { height:7px; }
+.simple_poll td.bb img { width:100%; height:6px; border-bottom:1px solid #E5E5E5; }
diff --git a/modules/poll/skins/simple/filter/poll.xml b/modules/poll/skins/simple/filter/poll.xml
new file mode 100644
index 000000000..2639e3195
--- /dev/null
+++ b/modules/poll/skins/simple/filter/poll.xml
@@ -0,0 +1,10 @@
+<filter name="poll" module="poll" act="procPoll" confirm_msg_code="confirm_poll_submit">
+    <form />
+    <parameter />
+    <response callback_func="completePoll">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="poll_srl" />
+        <tag name="tpl" />
+    </response>
+</filter>
diff --git a/modules/poll/skins/simple/form.html b/modules/poll/skins/simple/form.html
new file mode 100644
index 000000000..6ebd8f874
--- /dev/null
+++ b/modules/poll/skins/simple/form.html
@@ -0,0 +1,61 @@
+<!--%import("filter/poll.xml")-->
+<!--%import("js/poll.js")-->
+<!--%import("css/poll.css")-->
+
+<script type="text/javascript">
+    var poll_alert_lang = "{$lang->msg_check_poll_item}";
+</script>
+
+<div id="poll_{$poll->poll_srl}" style="{$poll->style}">
+
+    <form action="./" method="get" onsubmit="return doPoll(this)">
+    <input type="hidden" name="poll_srl" value="{$poll->poll_srl}" />
+    <input type="hidden" name="poll_srl_indexes" value="" />
+    <input type="hidden" name="skin" value="{$skin}" />
+
+    <table cellspacing="0" class="simple_poll">
+    <tr>
+        <td colspan="2">
+            {@ $_key = 0}
+            <!--@foreach($poll->poll as $poll_srl_index => $val)-->
+            <div <!--@if($_key>0)-->class="itemDiv"<!--@end-->>
+                <input type="hidden" name="checkcount_{$poll_srl_index}" value="{$val->checkcount}" />
+
+                <div class="title">{$val->title}</div>
+
+                <!--@if($val->checkcount>1)-->
+                <div class="checkcount">({$lang->poll_checkcount} : {$val->checkcount})</div>
+                <!--@end-->
+
+                <!--@foreach($val->item as $item_srl => $item)-->
+                {@$_idx = $poll->poll_srl.'_'.$poll_srl_index.'_'.$item_srl}
+
+                <div class="item">
+                    <!--@if($val->checkcount>1)-->
+                        <input type="checkbox" name="item_{$poll->poll_srl}_{$poll_srl_index}" value="{$item->poll_item_srl}" id="item_{$item->poll_item_srl}" /> 
+                    <!--@else-->
+                        <input type="radio" name="item_{$poll->poll_srl}_{$poll_srl_index}" value="{$item->poll_item_srl}" id="item_{$item->poll_item_srl}" /> 
+                    <!--@end-->
+                        <label for="item_{$item->poll_item_srl}">{$item->title}</label>
+                </div>
+            </div>
+            <!--@end-->
+
+            {@ $_key++}
+            <!--@end-->
+        </td>
+    </tr>
+    <tr>
+        <td class="poll_button">
+            <input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" />
+        </td>
+        <td class="stopDate">
+            ~<strong>{zdate($poll->stop_date, "Y-m-d")}</strong> (<a href="#" onclick="doPollViewResult('{$poll->poll_srl}','{$skin}'); return false;"/>{$lang->cmd_view_result}</a>)
+        </td>
+    </tr>
+    </tr>
+    </table>
+
+    </form>
+
+</div>
diff --git a/modules/poll/skins/simple/images/color_bar.png b/modules/poll/skins/simple/images/color_bar.png
new file mode 100755
index 0000000000000000000000000000000000000000..2afe557c030053078d15412b2562edbd946a0a6d
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0y~yV7~xlvvDv1Ns(ETCIKmybVpxD28Q(~%vrl$0{N09
zt`Q}{`DrEPiAAXljw$&`sS2LCiRr09sfj6-g(p*OfQoK;x;TbZ+<J4to9loA59@)d
zmV4`te@!dA+iK4eI3u!ckGsdOPrqd}w3=VIFN!nT{4@Ghxt^TCrThQR=w$}80Zm|d
zVC2eB_WTA514B!rLeuZ_Z&)&q9D1~lhh^XVvQUYvLR&46Du#v}mW1}cOdv~wP4%<>
zE~RfxEX%+$40W6b`eeC5Y@Scs=N&nB$YTdHh<8AN@y5nvMj)%f@!z${HzFlC%R%A{
z5-JT0Z!RbTWjL4(od0hLm*6Pe?Rq2U94I&#7^cKAFtRcHj+T@tE#v^}@O1TaS?83{
F1OQf^Ycc=;

literal 0
HcmV?d00001

diff --git a/modules/poll/skins/simple/js/poll.js b/modules/poll/skins/simple/js/poll.js
new file mode 100644
index 000000000..5c359e814
--- /dev/null
+++ b/modules/poll/skins/simple/js/poll.js
@@ -0,0 +1,64 @@
+/* 설문 참여 함수 */
+function doPoll(fo_obj) {
+
+    var checkcount = new Array();
+    var item = new Array();
+
+    for(var i=0;i<fo_obj.length;i++) {
+        var obj = fo_obj[i];
+        if(obj.nodeName != 'INPUT') continue;
+
+        var name = obj.name;
+        if(name.indexOf('checkcount')>-1) {
+            var t = name.split('_');
+            var poll_srl_index = parseInt(t[1],10);
+            checkcount[poll_srl_index] = obj.value;
+            item[poll_srl_index] = new Array();
+
+        } else if(name.indexOf('item_')>-1) {
+            var t = name.split('_');
+            var poll_srl = parseInt(t[1],10); 
+            var poll_srl_index = parseInt(t[2],10); 
+            if(obj.checked == true) item[poll_srl_index][item[poll_srl_index].length] = obj.value;
+        }
+    }
+
+    var poll_srl_indexes = "";
+    for(var poll_srl_index in checkcount) {
+	if(!checkcount.hasOwnProperty(poll_srl_index)) continue;
+        var count = checkcount[poll_srl_index];
+        var items = item[poll_srl_index];
+        if(items.length < 1 || count < items.length) {
+            alert(poll_alert_lang);
+            return false;
+        }
+
+        poll_srl_indexes += items.join(',')+',';
+    }
+    fo_obj.poll_srl_indexes.value = poll_srl_indexes;
+
+    procFilter(fo_obj, poll);
+    return false;
+}
+
+/* 설문 조사후 내용을 바꿀 함수 */
+function completePoll(ret_obj) {
+    var poll_srl = ret_obj['poll_srl'];
+    var tpl = ret_obj['tpl'];
+    var width = xWidth("poll_"+poll_srl);
+    xInnerHtml("poll_"+poll_srl, tpl);
+    xWidth("poll_"+poll_srl, width);
+}
+
+/* 설문 미리 보기 */
+function doPollViewResult(poll_srl, skin) {
+    var params = new Array();
+    params['poll_srl'] = poll_srl;
+
+    if(typeof(skin)=='undefined') skin = 'default';
+    params['skin'] = skin;
+
+    var response_tags = new Array('error','message','poll_srl', 'tpl');
+
+    exec_xml('poll','procPollViewResult', params, completePoll, response_tags);
+}
diff --git a/modules/poll/skins/simple/result.html b/modules/poll/skins/simple/result.html
new file mode 100644
index 000000000..8d1d18bbf
--- /dev/null
+++ b/modules/poll/skins/simple/result.html
@@ -0,0 +1,36 @@
+<!--%import("css/poll.css")-->
+
+<div class="poll_box" style="{$poll->style}">
+
+    <table cellspacing="0" class="simple_poll">
+    <tr>
+        <td>
+            {@ $_key = 0}
+            <!--@foreach($poll->poll as $poll_srl_index => $val)-->
+            <div <!--@if($_key>0)-->class="itemDiv"<!--@end-->>
+
+                <div class="title">{$val->title} ({$val->poll_count})</div>
+
+                <!--@foreach($val->item as $item_srl => $item)-->
+                    {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
+                    <!--@if($per<1)-->{@$per = 1; }<!--@end-->
+
+                    <div class="item">
+                        {$item->title} 
+                    </div>
+
+                    <div class="barBox">
+                        <div class="bar"><img src="./images/color_bar.png" style="width:{$per}%;height:6px;" alt="bar" /></div>
+                        <div class="status">{$item->poll_count} ({$per}%)</div>
+                    </div>
+                    <div class="clear"></div>
+                <!--@end-->
+
+            </div>
+            {@ $_key++}
+            <!--@end-->
+        </td>
+    </tr>
+    </table>
+
+</div>
diff --git a/modules/poll/skins/simple/skin.xml b/modules/poll/skins/simple/skin.xml
new file mode 100644
index 000000000..bab3143bc
--- /dev/null
+++ b/modules/poll/skins/simple/skin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skin>
+  <title xml:lang="ko">설문조사 간단한 스킨</title>
+  <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 16">
+    <name xml:lang="ko">제로</name>
+    <description xml:lang="ko">설문조사 간단한 스킨</description>
+  </maker>
+  <colorset>
+    <color name="normal">
+      <title xml:lang="ko">기본</title>
+      <title xml:lang="zh-CN">默认</title>
+      <title xml:lang="jp">デフォルト</title>
+      <title xml:lang="en">Default</title>
+    </color>
+  </colorset>
+</skin>

From 9e5f1af71cf0b21ec7142845d36c736d1e5a613f Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 Apr 2008 09:37:43 +0000
Subject: [PATCH 016/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4112
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/poll/skins/simple/css/.poll.css.swp | Bin 12288 -> 0 bytes
 modules/poll/skins/simple/result.html       |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 modules/poll/skins/simple/css/.poll.css.swp

diff --git a/modules/poll/skins/simple/css/.poll.css.swp b/modules/poll/skins/simple/css/.poll.css.swp
deleted file mode 100644
index ec18e38c6d63bd09af67b007acebc5f6872d9de5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2%We}%6oxBEh|5eE1UptWL@eEICnBKs1{lb|0tq2O*hPIQJ4M=EO?Nq%L>VD5
zGt!9L4i-ECmp!}y5)Z(Nd4!pHgc1DJx7cwL!y=JDr&@nH?(RD0udhy(t;C*v{nBNA
z%4#vR!;D$)_Fmk3<}Y^DVr)$$%3Pk*RHq|-G3hDBelr1^i;IiRHE$rAJr(prkv3x$
zhRt+EMrkvZy*Lz2Kh3XN_+@ffdV&ZLfk_1Vy3;s4&E{rX_RR60`OzcSCiS5EM1Tko
z0U|&IhyW2F0z`lad}jo7JjFg@OnabX&{QFus1X4oKm>>Y5g-CYfCvx)B0vO)01+Sp
z-w6RXVC>*Q#{PuN|NqV30N(t>*lXw!<UuYp1-(7Q*c0dmGy@%n-cK|37`h1k3jO^f
zV^5(c&^+|$2gV*k51=d1|H$*9$oB`%zeD$+Y3S7f#$G}%py$v6^madEx1j&_F}4ET
zgs2e#B0vO)01^1M2w3?S+?LE&-nb4dUqxC(nrqh!g(bD<EqQLTl)W_fQ|;=0%2S=F
zsLR)R2hTTd3)x-Pj;F$)&3zTB#F;sH`WL&^YV!@YT?)Y3?)EM?5Y|q3*ol~5MRpeq
zAjRirFOaKw^=L8BUr;V~*4lYJb=;l|?>PTFzQ5xM{(W}0NSewu;k0JsL7Uf%%k#MG
znS#G91HJ6DZ2Lr;FXweXZ~AyD2}IKHl-8=}wBi9zRVV{KbK#^p>J|cGu9q=RnHb}1
zWhb&CsptAD-9+`HpiwN>g?SusSq!PLGmhWv6H8tngN(Q}`~pEU0wY7eU>ewrr8}Fo
zYO`3#S}_qLyGiT@fsDFY)Hy&kU~#UD&f4|hMy;75Y`CH9MouU?x|%Jm;$gq%vexFj
z$l5UXO}3435Gn4RceUUycoq=LQDx}@;j6^eQbkUrB2hQHRg85$<S;RtX@#bYS=85O
z98WgPE$rjx)PR>;_&SeODl>nshg$7xc+7G;cAJ|#IE_{0W*CIS$a`+ml~E(_hgD%_
zqqt^5)R%P?r0Q>G1&hk`u3RM|1in?cDvGk4>#c7YJlkowjN-noEE)G@@zf8*yt!@8
z-Ta(6O7mvcxs4<DRD;1^7XFHlC1g@=ng5!{wbY^5d~#&F8!7mjzQ*Wzxr*M~7r_ws
zY>AY^&&QJeG&8ytpH+GrufcIMsG4F$0&1QxuanWJC}{Hmq7k}xR9`zCIS}}0FuZpT
Mg()_UY?W-VPoOt3CjbBd

diff --git a/modules/poll/skins/simple/result.html b/modules/poll/skins/simple/result.html
index 8d1d18bbf..c0487580e 100644
--- a/modules/poll/skins/simple/result.html
+++ b/modules/poll/skins/simple/result.html
@@ -1,6 +1,6 @@
 <!--%import("css/poll.css")-->
 
-<div class="poll_box" style="{$poll->style}">
+<div style="{$poll->style}">
 
     <table cellspacing="0" class="simple_poll">
     <tr>

From 13f1f27ba186da8c06bed392218f12ba791d4baa Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 Apr 2008 09:53:27 +0000
Subject: [PATCH 017/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4113
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/poll/skins/simple/css/poll.css | 13 ++++++++-----
 modules/poll/skins/simple/form.html    | 10 ++++++----
 modules/poll/skins/simple/result.html  |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/modules/poll/skins/simple/css/poll.css b/modules/poll/skins/simple/css/poll.css
index c4a94464b..e280be5ca 100644
--- a/modules/poll/skins/simple/css/poll.css
+++ b/modules/poll/skins/simple/css/poll.css
@@ -6,17 +6,20 @@
 .simple_poll td .itemDiv { border-top:1px solid #BBBBBB; margin-top:3px; padding:3px 0 3px 0; }
 .simple_poll td .title { color:#000000; font-weight:bold; }
 .simple_poll td .checkcount { color:#AAAAAA; }
+
 .simple_poll td .item { color:#636363; margin:3px 0 0 10px; }
 .simple_poll td .item input { margin:0; padding:0; }
 
-.simple_poll td .barBox { margin-left:10px; position:relative; height:20px; }
-.simple_poll td .barBox .bar { margin-right:100px; margin-top:7px; }
-.simple_poll td .barBox .status { position:absolute; right:0; top:0; }
+.simple_poll td .resultItem { color:#636363; margin:6px 0 0 10px; }
 
-.simple_poll td.stopDate { text-align:right; color:#AAAAAA; border-top:1px solid #BBBBBB; padding-top:3px;}
+.simple_poll td .barBox { margin-left:25px; }
+.simple_poll td .barBox .bar { margin:3px 0;}
+.simple_poll td .barBox .status {color:#AAAAAA; }
+
+.simple_poll td.stopDate { color:#AAAAAA; border-top:1px solid #BBBBBB; padding-top:3px;}
 .simple_poll td.stopDate a { color:#AAAAAA; text-decoration:none; }
 
-.simple_poll td.poll_button { text-align:left; border-top:1px solid #BBBBBB;  padding-top:3px;}
+.simple_poll td.poll_button { text-align:left; padding-top:3px;}
 .simple_poll td.poll_button .poll_button { border:1px solid #EEEEEE; background-color:#AAAAAA; color:#FFFFFF; font-weight:bold; padding:1px 3px 1px 3px; height:20px; }
 
 
diff --git a/modules/poll/skins/simple/form.html b/modules/poll/skins/simple/form.html
index 6ebd8f874..b961cc593 100644
--- a/modules/poll/skins/simple/form.html
+++ b/modules/poll/skins/simple/form.html
@@ -15,7 +15,7 @@
 
     <table cellspacing="0" class="simple_poll">
     <tr>
-        <td colspan="2">
+        <td>
             {@ $_key = 0}
             <!--@foreach($poll->poll as $poll_srl_index => $val)-->
             <div <!--@if($_key>0)-->class="itemDiv"<!--@end-->>
@@ -46,13 +46,15 @@
         </td>
     </tr>
     <tr>
-        <td class="poll_button">
-            <input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" />
-        </td>
         <td class="stopDate">
             ~<strong>{zdate($poll->stop_date, "Y-m-d")}</strong> (<a href="#" onclick="doPollViewResult('{$poll->poll_srl}','{$skin}'); return false;"/>{$lang->cmd_view_result}</a>)
         </td>
     </tr>
+    <tr>
+        <td class="poll_button">
+            <input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" />
+        </td>
+    </tr>
     </tr>
     </table>
 
diff --git a/modules/poll/skins/simple/result.html b/modules/poll/skins/simple/result.html
index c0487580e..0087828a4 100644
--- a/modules/poll/skins/simple/result.html
+++ b/modules/poll/skins/simple/result.html
@@ -15,7 +15,7 @@
                     {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
                     <!--@if($per<1)-->{@$per = 1; }<!--@end-->
 
-                    <div class="item">
+                    <div class="resultItem">
                         {$item->title} 
                     </div>
 

From 7caf3058197e9848368bbd79b8aa8c5e5fe7a4ab Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 Apr 2008 10:05:08 +0000
Subject: [PATCH 018/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4114
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/poll/poll.controller.php       | 6 +++++-
 modules/poll/skins/simple/css/poll.css | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index 9a4e049a4..53d013e43 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -170,8 +170,11 @@
 
             $oDB->commit();
 
+            $skin = Context::get('skin'); 
+            if(!$skin || !is_dir('./modules/poll/skins/'.$skin)) $skin = 'default';
+
             // tpl 가져오기
-            $tpl = $oPollModel->getPollHtml($poll_srl);
+            $tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
 
             $this->add('poll_srl', $poll_srl);
             $this->add('tpl',$tpl);
@@ -183,6 +186,7 @@
          **/
         function procPollViewResult() {
             $poll_srl = Context::get('poll_srl'); 
+
             $skin = Context::get('skin'); 
             if(!$skin || !is_dir('./modules/poll/skins/'.$skin)) $skin = 'default';
 
diff --git a/modules/poll/skins/simple/css/poll.css b/modules/poll/skins/simple/css/poll.css
index e280be5ca..c6d1262fc 100644
--- a/modules/poll/skins/simple/css/poll.css
+++ b/modules/poll/skins/simple/css/poll.css
@@ -7,7 +7,7 @@
 .simple_poll td .title { color:#000000; font-weight:bold; }
 .simple_poll td .checkcount { color:#AAAAAA; }
 
-.simple_poll td .item { color:#636363; margin:3px 0 0 10px; }
+.simple_poll td .item { color:#636363; margin:10px 0 10px 10px; }
 .simple_poll td .item input { margin:0; padding:0; }
 
 .simple_poll td .resultItem { color:#636363; margin:6px 0 0 10px; }

From 3565bfed9a38528f110191a1d43c84716b73730a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 Apr 2008 10:06:09 +0000
Subject: [PATCH 019/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4115
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/poll/skins/simple/result.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/poll/skins/simple/result.html b/modules/poll/skins/simple/result.html
index 0087828a4..ac1f11c36 100644
--- a/modules/poll/skins/simple/result.html
+++ b/modules/poll/skins/simple/result.html
@@ -13,14 +13,13 @@
 
                 <!--@foreach($val->item as $item_srl => $item)-->
                     {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
-                    <!--@if($per<1)-->{@$per = 1; }<!--@end-->
 
                     <div class="resultItem">
                         {$item->title} 
                     </div>
 
                     <div class="barBox">
-                        <div class="bar"><img src="./images/color_bar.png" style="width:{$per}%;height:6px;" alt="bar" /></div>
+                        <div class="bar"><img src="./images/color_bar.png" style="width:<!--@if($per<1)-->1<!--@else-->{$per}<!--@end-->%;height:6px;" alt="bar" /></div>
                         <div class="status">{$item->poll_count} ({$per}%)</div>
                     </div>
                     <div class="clear"></div>

From 989d66ad5d344f222a0caf564611ee6ace183187 Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 16 Apr 2008 14:58:28 +0000
Subject: [PATCH 020/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=B6=80=EB=B6=84=20=EB=B2=88=EC=97=AD=20(SS?=
 =?UTF-8?q?L=20=EB=B3=B4=EC=95=88=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84)?=
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@4116 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/zh-CN.lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index d0277b72b..898e5a309 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -45,8 +45,8 @@
     $lang->signature_max_height = '签名高度限制';
     $lang->enable_openid = '支持OpenID';
     $lang->enable_join = '允许会员注册';
-    $lang->enable_ssl = 'SSL 기능 사용';
-    $lang->security_sign_in = 'Sign in using enhanced security';
+    $lang->enable_ssl = '使用SSL功能';
+    $lang->security_sign_in = '使用安全登录';
     $lang->limit_day = '认证限制';
     $lang->limit_date = '限制日期';
     $lang->after_login_url = '登录后页面转向';
@@ -186,7 +186,7 @@
 
     $lang->about_enable_openid = '要想网站支持OpenID时请勾选此项。';
     $lang->about_enable_join = '选择此项后用户才可以注册。';
-    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
+    $lang->about_enable_ssl = '如服务器提供SSL协议服务，新会员注册/修改会员信息/登录等信息的传送将使用SSL(https)协议。';
     $lang->about_limit_day = '注册会员后的认证有效期限。';
     $lang->about_limit_date = '直到指定日期该用户不能登录。';
     $lang->about_after_login_url = '可以指定登录后的页面转向url(留空为当前页面)。';

From e395d9eaf8a96026159d0dea8877cb117d35dc29 Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 16 Apr 2008 14:59:09 +0000
Subject: [PATCH 021/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EB=B2=88=EC=97=AD?=
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@4117 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/poll/skins/default/skin.xml | 4 ++--
 modules/poll/skins/simple/skin.xml  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/poll/skins/default/skin.xml b/modules/poll/skins/default/skin.xml
index b5102845d..69544789b 100644
--- a/modules/poll/skins/default/skin.xml
+++ b/modules/poll/skins/default/skin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skin>
   <title xml:lang="ko">설문조사 기본 스킨</title>
-  <title xml:lang="zh-CN">投票调查默认皮肤</title>
+  <title xml:lang="zh-CN">投票系统默认皮肤</title>
   <title xml:lang="jp">アンケート調査デフォルトスキン</title>
   <title xml:lang="en">Default Skin of Poll</title>
   <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
@@ -10,7 +10,7 @@
     <name xml:lang="jp">Zero</name>
     <name xml:lang="en">zero</name>
     <description xml:lang="ko">설문조사 기본 스킨</description>
-    <description xml:lang="zh-CN">投票调查默认皮肤。</description>
+    <description xml:lang="zh-CN">投票系统默认皮肤。</description>
     <description xml:lang="jp">アンケート調査デフォルトスキン</description>
     <description xml:lang="en">Default Skin of Poll</description>
   </maker>
diff --git a/modules/poll/skins/simple/skin.xml b/modules/poll/skins/simple/skin.xml
index bab3143bc..3dd612026 100644
--- a/modules/poll/skins/simple/skin.xml
+++ b/modules/poll/skins/simple/skin.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skin>
   <title xml:lang="ko">설문조사 간단한 스킨</title>
+  <title xml:lang="zh-CN">投票系统简易皮肤</title>
   <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 16">
     <name xml:lang="ko">제로</name>
+	<name xml:lang="zh-CN">zero</name>
     <description xml:lang="ko">설문조사 간단한 스킨</description>
+	<description xml:lang="zh-CN">投票系统简易皮肤。</description>
   </maker>
   <colorset>
     <color name="normal">

From 8c6ff8a40592361fe2f4c15708d304b1770bc784 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 17 Apr 2008 07:29:45 +0000
Subject: [PATCH 022/111] =?UTF-8?q?=EC=9C=84=EC=A0=AF=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=8B=9C=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EA=B0=92=EB=93=A4=EC=9D=84=20=EC=A0=9C=EA=B1=B0?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
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@4118 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/widget/widget.controller.php | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index ade15ed22..a6a0f728b 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -26,6 +26,7 @@
             unset($vars->module);
             unset($vars->act);
             unset($vars->selected_widget);
+            unset($vars->body);
 
             if($vars->widget_sequence) {
                 $cache_path = './files/cache/widget_cache/';
@@ -33,31 +34,19 @@
                 @unlink($cache_file);
             }
 
-            $vars->widget_sequence = getNextSequence();
-            if(!$vars->widget_cache) $vars->widget_cache = 0;
+            if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
 
             $attribute = array();
             if($vars) {
                 foreach($vars as $key => $val) {
+                    if(!$val) continue;
                     if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
                     $val = htmlspecialchars($val);
                     $attribute[] = sprintf('%s="%s"', $key, $val);
                 }
             }
 
-            if($vars->widget_fix_width == 'Y') {
-                $widget_width_type = strtolower($vars->widget_width_type);
-                if(!$widget_width_type||!in_array($widget_width_type,array("px","%"))) $widget_width_type = "px";
-
-                $style .= sprintf("%s:%s%s;", "width", trim($vars->widget_width), $widget_width_type);
-
-                if($vars->widget_position) $style .= sprintf("%s:%s;", "float", trim($vars->widget_position));
-                else $style .= "float:left;";
-                $widget_code = sprintf('<img src="%s" height="100" class="zbxe_widget_output" widget="%s" %s style="%s" />', $blank_img_path, $widget, implode(' ',$attribute), $style);
-            } else {
-                $style = "clear:both;";
-                $widget_code = sprintf('<img width="%s" height="100" src="%s" class="zbxe_widget_output" style="%s" widget="%s" %s />', "100%", $blank_img_path, $style, $widget, implode(' ',$attribute));
-            }
+            $widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ',$attribute));
 
             $cache_path = './files/cache/widget_cache/';
             $cache_file = sprintf('%s%d.%s.cache', $cache_path, $vars->widget_sequence, Context::getLangType());
@@ -79,8 +68,8 @@
             $vars = Context::getRequestVars();
             $widget = $vars->selected_widget;
             unset($vars->module);
-            unset($vars->body);
             unset($vars->act);
+            unset($vars->body);
             unset($vars->selected_widget);
 
             if($vars->widget_sequence) {
@@ -88,13 +77,14 @@
                 $cache_file = sprintf('%s%d.%s.cache', $cache_path, $vars->widget_sequence, Context::getLangType());
                 @unlink($cache_file);
             }
-            $vars->widget_sequence = getNextSequence();
-            if(!$vars->widget_cache) $vars->widget_cache = 0;
+
+            if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
 
             // args 정리
             $attribute = array();
             if($vars) {
                 foreach($vars as $key => $val) {
+                    if(!$val) continue;
                     if(strpos($val,'|@|')>0) {
                         $val = str_replace('|@|',',',$val);
                         $vars->{$key} = $val;

From 8f277dece30ad89c0f608eeffa1d611adfbc2634 Mon Sep 17 00:00:00 2001
From: supershop <supershop@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Thu, 17 Apr 2008 15:27:18 +0000
Subject: [PATCH 023/111] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EB=B2=88=EC=97=AD?=
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@4119 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/en.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index fc005483c..74ad8fb4e 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -186,7 +186,7 @@
 
     $lang->about_enable_openid = 'Allow users to sign up as OpenID';
     $lang->about_enable_join = 'Allow users to sign up';
-    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
+    $lang->about_enable_ssl = 'Personal information from Join/Modify Member Info/Login can be sent as SSL(https) mode if server provides SSL service.';
     $lang->about_limit_day = 'You can limit certification date after sign up';
     $lang->about_limit_date = 'User cannot login until assigned date';
     $lang->about_after_login_url = 'You can set URL after login. Blank means current page.';

From 1c37f1f49a00e4e941413871b579192736ef197a Mon Sep 17 00:00:00 2001
From: aerofleet <aerofleet@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 18 Apr 2008 07:54:02 +0000
Subject: [PATCH 024/111] =?UTF-8?q?=EB=B2=88=EC=97=AD=EC=88=98=EC=A0=95?=
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@4120 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/member_extra_info/lang/en.lang.php | 2 +-
 modules/admin/tpl/index.html              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/member_extra_info/lang/en.lang.php b/addons/member_extra_info/lang/en.lang.php
index 462d12387..cc9cce249 100644
--- a/addons/member_extra_info/lang/en.lang.php
+++ b/addons/member_extra_info/lang/en.lang.php
@@ -1,3 +1,3 @@
 <?php
-    $lang->alert_new_message_arrived = 'You got a new message. Do you want to check now?';
+    $lang->alert_new_message_arrived = 'You have a new message. Do you want to check now?';
 ?>
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index b3227c820..619a3c315 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -51,7 +51,7 @@
     </td>
 </tr>
 <tr>
-    <th scope="row">Lang</th>
+    <th scope="row">Language Selection</th>
     <td>
         <select name="lang_type" onchange="doChangeLangType(this)">
             <option value="{$lang_type}">{$lang_supported[$lang_type]}</option>

From 938c8830fd8a7425cd7a2a8fb7afe9c7d024e1d5 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Fri, 18 Apr 2008 11:00:48 +0000
Subject: [PATCH 025/111] =?UTF-8?q?spamfilter=20=EC=8A=A4=ED=8C=B8?=
 =?UTF-8?q?=EB=8B=A8=EC=96=B4=EC=97=90=20=EB=94=B0=EC=98=B4=ED=91=9C?=
 =?UTF-8?q?=EA=B0=80=20=EC=9E=88=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
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@4121 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/spamfilter/spamfilter.admin.controller.php | 2 +-
 modules/spamfilter/tpl/denied_word_list.html       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php
index 40a21f2a4..40af70329 100644
--- a/modules/spamfilter/spamfilter.admin.controller.php
+++ b/modules/spamfilter/spamfilter.admin.controller.php
@@ -57,7 +57,7 @@
          * @brief 금지 Word삭제
          **/
         function procSpamfilterAdminDeleteDeniedWord() {
-            $word = Context::get('word');
+            $word = base64_decode(Context::get('word'));
             return $this->deleteWord($word);
         }
 
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html
index 210cc1d1c..4f28bb8a9 100644
--- a/modules/spamfilter/tpl/denied_word_list.html
+++ b/modules/spamfilter/tpl/denied_word_list.html
@@ -65,6 +65,7 @@
         <td class="tahoma">{count($word_list)-$no}</td>
         <td>{$val->word}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
+        {@ $val->word = base64_encode($val->word);}
         <td class="red"><a href="#" onclick="doDeleteDeniedWord('{$val->word}');return false;">{$lang->cmd_delete}</a></td>
     </tr>
     <!--@end-->

From fb08c61fce59191829313637cf0b81eb1add9474 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sun, 20 Apr 2008 13:04:31 +0000
Subject: [PATCH 026/111] =?UTF-8?q?#423=20=EC=97=85=EB=A1=9C=EB=93=9C=20?=
 =?UTF-8?q?=ED=8F=BC=20=EC=95=84=EB=9E=98=EC=97=90=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=A0=9C=ED=95=9C=20=ED=81=AC=EA=B8=B0=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C?=
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@4122 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.admin.view.php          |  4 ++++
 modules/member/skins/default/modify_info.html | 11 +++++++----
 modules/member/tpl/member_info.html           |  9 ++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 48cd196aa..453d23cc4 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -111,6 +111,10 @@
         function dispMemberAdminInfo() {
             // 추가 가입폼 목록을 받음
             $oMemberModel = &getModel('member');
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+
+            Context::set('member_config', $member_config);
             Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info));
 
             $this->setTemplateFile('member_info');
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index ef3e07843..0be83599a 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -55,7 +55,7 @@
     </tr>
 
     <!--@if($member_config->profile_image == 'Y')-->
-    <tr>    
+    <tr>
         <th scope="row">{$lang->profile_image}</th>
         <td>
             <!--@if($member_info->profile_image->src)-->
@@ -69,11 +69,12 @@
                 <div class="form"><input type="file" name="profile_image" value="" /></div>
                 <a href="#" onclick="doUploadProfileImage();return false;" class="button"><span>{$lang->cmd_registration}</span></a>
             </div>
+            <p>{$lang->profile_image_max_width} : {$member_config->profile_image_max_width}px, {$lang->profile_image_max_height} : {$member_config->profile_image_max_height}px</p>
         </td>
     </tr>
     <!--@end-->
     <!--@if($member_config->image_name == 'Y')-->
-    <tr>    
+    <tr>
         <th scope="row">{$lang->image_name}</th>
         <td>
             <!--@if($member_info->image_name->src)-->
@@ -87,11 +88,12 @@
                 <div class="form"><input type="file" name="image_name" value="" /></div>
                 <a href="#" onclick="doUploadImageName();return false;" class="button"><span>{$lang->cmd_registration}</span></a>
             </div>
+            <p>{$lang->image_name_max_width} : {$member_config->image_name_max_width}px, {$lang->image_name_max_height} : {$member_config->image_name_max_height}px</p>
         </td>
     </tr>
     <!--@end-->
     <!--@if($member_config->image_mark == 'Y')-->
-    <tr>    
+    <tr>
         <th scope="row">{$lang->image_mark}</th>
         <td>
             <!--@if($member_info->image_mark->src)-->
@@ -105,6 +107,7 @@
                 <div class="form"><input type="file" name="image_mark" value="" /></div>
                 <a href="#" onclick="doUploadImageMark();return false;" class="button"><span>{$lang->cmd_registration}</span></a>
             </div>
+            <p>{$lang->image_mark_max_width} : {$member_config->image_mark_max_width}px, {$lang->image_mark_max_height} : {$member_config->image_mark_max_height}px</p>
         </td>
     </tr>
     <!--@end-->
@@ -167,7 +170,7 @@
         </th>
         <td>
             <!-- 일반 text -->
-            <!--@if($val->column_type == 'text')--> 
+            <!--@if($val->column_type == 'text')-->
                 <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
 
             <!-- 홈페이지 주소 -->
diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html
index 772a33a77..620c21e78 100644
--- a/modules/member/tpl/member_info.html
+++ b/modules/member/tpl/member_info.html
@@ -43,6 +43,7 @@
             <input type="file" name="profile_image" value="" />
             <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
         </form>
+        <p>{$lang->profile_image_max_width} : {$member_config->profile_image_max_width}px, {$lang->profile_image_max_height} : {$member_config->profile_image_max_height}px</p>
     </td>
 </tr>
 <tr>
@@ -65,6 +66,7 @@
             <input type="file" name="image_name" value="" />
             <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
         </form>
+        <p>{$lang->image_name_max_width} : {$member_config->image_name_max_width}px, {$lang->image_name_max_height} : {$member_config->image_name_max_height}px</p>
     </td>
 </tr>
 <tr>
@@ -78,7 +80,7 @@
         <!--@end-->
     </td>
 </tr>
-<tr>    
+<tr>
     <td>
         <form action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
         <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
@@ -87,6 +89,7 @@
         <input type="file" name="image_mark" value="" />
         <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
         </form>
+        <p>{$lang->image_mark_max_width} : {$member_config->image_mark_max_width}px, {$lang->image_mark_max_height} : {$member_config->image_mark_max_height}px</p>
     </td>
 </tr>
 <tr>
@@ -148,9 +151,9 @@
     <th scope="row">{htmlspecialchars($val->column_title)}<!--@if($val->is_opened)--> <span class="publicItem">({$lang->public})</span><!--@end--></th>
     <td>
         <!--@if($val->column_type=='tel')-->
-            {htmlspecialchars($val->value[0])} 
+            {htmlspecialchars($val->value[0])}
                 <!--@if($val->value[1])-->-<!--@end-->
-            {htmlspecialchars($val->value[1])} 
+            {htmlspecialchars($val->value[1])}
                 <!--@if($val->value[2])-->-<!--@end-->
             {htmlspecialchars($val->value[2])}
         <!--@elseif($val->column_type=='kr_zip')-->

From 1bbc3c1b9c5e55f78d6b6d64c8f1a6f3f8877d52 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 21 Apr 2008 04:58:18 +0000
Subject: [PATCH 027/111] =?UTF-8?q?#450.=20=EC=95=A0=EB=93=9C=EC=98=A8?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=99=9C=EC=84=B1=ED=99=94=20=EB=8C=80?=
 =?UTF-8?q?=EC=83=81=20=EB=AA=A8=EB=93=88=20=EC=84=A0=ED=83=9D=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80.=20=EC=95=A0=EB=93=9C=EC=98=A8?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B6=8C=ED=95=9C=20=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9D=84=20=EC=84=A0=ED=83=9D=ED=95=98=EB=8A=94=20=EA=B2=83?=
 =?UTF-8?q?=EC=9D=80=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=98=EB=8B=A4?=
 =?UTF-8?q?=EA=B3=A0=20=ED=8C=90=EB=8B=A8.=20=EA=B4=80=EB=A0=A8=ED=95=98?=
 =?UTF-8?q?=EC=97=AC=20=EC=97=90=EB=94=94=ED=84=B0=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=EC=97=90=EC=84=9C=EB=8F=84=20=EB=8C=80?=
 =?UTF-8?q?=EC=83=81=20=EB=AA=A8=EB=93=88=EC=9D=84=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EA=B8=B0?=
 =?UTF-8?q?=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@4123 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/addon/addon.admin.controller.php     | 14 ++++--
 modules/addon/addon.admin.model.php          | 18 +++++---
 modules/addon/addon.admin.view.php           | 16 ++++++-
 modules/addon/lang/en.lang.php               |  1 +
 modules/addon/lang/es.lang.php               |  1 +
 modules/addon/lang/fr.lang.php               |  1 +
 modules/addon/lang/jp.lang.php               |  1 +
 modules/addon/lang/ko.lang.php               |  1 +
 modules/addon/lang/ru.lang.php               |  1 +
 modules/addon/lang/zh-CN.lang.php            |  1 +
 modules/addon/queries/updateAddon.xml        |  2 +-
 modules/addon/tpl/addon_list.html            |  8 +---
 modules/addon/tpl/css/addon.css              |  4 ++
 modules/addon/tpl/js/addon.js                |  8 ++++
 modules/addon/tpl/setup_addon.html           | 47 +++++++++++++-------
 modules/editor/editor.admin.controller.php   |  1 +
 modules/editor/editor.admin.view.php         | 19 ++++++++
 modules/editor/editor.model.php              | 14 ++++++
 modules/editor/lang/en.lang.php              |  4 +-
 modules/editor/lang/es.lang.php              |  4 +-
 modules/editor/lang/fr.lang.php              |  4 +-
 modules/editor/lang/jp.lang.php              |  4 +-
 modules/editor/lang/ko.lang.php              |  4 +-
 modules/editor/lang/ru.lang.php              |  4 +-
 modules/editor/lang/zh-CN.lang.php           |  4 +-
 modules/editor/tpl/css/editor_admin.css      |  4 ++
 modules/editor/tpl/js/editor_admin.js        |  8 ++++
 modules/editor/tpl/setup_component.html      | 32 +++++++++++++
 modules/widget/tpl/widget_generate_code.html |  2 +
 29 files changed, 184 insertions(+), 48 deletions(-)
 create mode 100644 modules/addon/tpl/css/addon.css
 create mode 100644 modules/editor/tpl/css/editor_admin.css

diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 4488afbc4..54333a371 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -41,6 +41,7 @@
             unset($args->module);
             unset($args->act);
             unset($args->addon_name);
+            unset($args->body);
 
             $this->doSetup($addon_name, $args);
 
@@ -55,18 +56,24 @@
             $buff = "";
             $oAddonModel = &getAdminModel('addon');
             $addon_list = $oAddonModel->getInsertedAddons();
-            foreach($addon_list as $addon=> $val) {
+            foreach($addon_list as $addon => $val) {
                 if($val->is_used != 'Y' || !is_dir('./addons/'.$addon) ) continue;
 
+                $extra_vars = unserialize($val->extra_vars);
+                $mid_list = $extra_vars->mid_list;
+                if(!is_array($mid_list)||!count($mid_list)) $mid_list = null;
+                $mid_list = base64_encode(serialize($mid_list));
+
                 if($val->extra_vars) {
                     unset($extra_vars);
                     $extra_vars = base64_encode($val->extra_vars);
                 }
 
-                $buff .= sprintf(' if(file_exists("./addons/%s/%s.addon.php")) { unset($addon_info); $addon_info = unserialize(base64_decode("%s")); $addon_path = "./addons/%s/"; @include("./addons/%s/%s.addon.php"); }', $addon, $addon, $extra_vars, $addon, $addon, $addon);
+                $buff .= sprintf(' $_ml = unserialize(base64_decode("%s")); if(file_exists("./addons/%s/%s.addon.php") && (!is_array($_ml) || in_array($_m, $_ml))) { unset($addon_info); $addon_info = unserialize(base64_decode("%s")); $addon_path = "./addons/%s/"; @include("./addons/%s/%s.addon.php"); }', $mid_list, $addon, $addon, $extra_vars, $addon, $addon, $addon);
             }
 
-            $buff = sprintf('<?php if(!defined("__ZBXE__"))exit(); %s ?>', $buff);
+            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $_m = Context::get(\'mid\'); %s ?>', $buff);
+            debugPrint($buff);
 
             FileHandler::writeFile($this->cache_file, $buff);
         }
@@ -106,6 +113,7 @@
          * @brief 애드온 설정
          **/
         function doSetup($addon, $extra_vars) {
+            if($extra_vars->mid_list) $extra_vars->mid_list = explode('|@|', $extra_vars->mid_list);
             $args->addon = $addon;
             $args->extra_vars = serialize($extra_vars);
             return executeQuery('addon.updateAddon', $args);
diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php
index 6808c1416..e0b5ae15a 100644
--- a/modules/addon/addon.admin.model.php
+++ b/modules/addon/addon.admin.model.php
@@ -110,14 +110,18 @@
                 $addon_info->history[] = $obj;
             }
 
-            // 확장변수
+            // DB에 설정된 내역을 가져온다
+            $db_args->addon = $addon;
+            $output = executeQuery('addon.getAddonInfo',$db_args);
+            $extra_vals = unserialize($output->data->extra_vars);
+
+            if($extra_vals->mid_list) {
+                $addon_info->mid_list = $extra_vals->mid_list;
+            } else {
+                $addon_info->mid_list = array();
+            }
+
             if($xml_obj->extra_vars) {
-
-                // DB에 설정된 내역을 가져온다
-                $db_args->addon = $addon;
-                $output = executeQuery('addon.getAddonInfo',$db_args);
-                $extra_vals = unserialize($output->data->extra_vars);
-
                 // 확장변수를 정리
                 if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var;
                 else $extra_vars = $xml_obj->extra_vars->var;
diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php
index dcbb3e38b..735a5361e 100644
--- a/modules/addon/addon.admin.view.php
+++ b/modules/addon/addon.admin.view.php
@@ -41,8 +41,22 @@
 
             // mid 목록을 가져옴
             $oModuleModel = &getModel('module');
+
+            // 모듈 카테고리 목록을 구함
+            $module_categories = $oModuleModel->getModuleCategories();
+
             $mid_list = $oModuleModel->getMidList();
-            Context::set('mid_list', $mid_list);
+
+            // module_category와 module의 조합
+            if($module_categories) {
+                foreach($mid_list as $module_srl => $module) {
+                    $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+                }
+            } else {
+                $module_categories[0]->list = $mid_list;
+            }
+
+            Context::set('mid_list',$module_categories);
 
             // 레이아웃을 팝업으로 지정
             $this->setLayoutFile('popup_layout');
diff --git a/modules/addon/lang/en.lang.php b/modules/addon/lang/en.lang.php
index e7bbedf60..c737da7ba 100644
--- a/modules/addon/lang/en.lang.php
+++ b/modules/addon/lang/en.lang.php
@@ -11,5 +11,6 @@
     $lang->addon_maker = 'Author of this Addon';
     $lang->addon_history = 'Addon History';
 
+    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
     $lang->about_addon = 'Addon is for controlling actions rather than displaying the HTML results.<br />Simply by toggling any addons you want on or off,  you can use very useful functions to administer your website';
 ?>
diff --git a/modules/addon/lang/es.lang.php b/modules/addon/lang/es.lang.php
index 030841be1..b814f6398 100644
--- a/modules/addon/lang/es.lang.php
+++ b/modules/addon/lang/es.lang.php
@@ -11,5 +11,6 @@
     $lang->addon_maker = 'Autor de Addon';
     $lang->addon_history = 'Historia de Addon ';
 
+    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
     $lang->about_addon = 'Addon is para controlar las acciones y no para mostrar el resultado en HTML.<br /> Sólo con activar o desactivar el addon que desee, podrá obtener funciones útiles para la administración de tu sitio web.';
 ?>
diff --git a/modules/addon/lang/fr.lang.php b/modules/addon/lang/fr.lang.php
index 404c50c3f..a3de0c5f5 100644
--- a/modules/addon/lang/fr.lang.php
+++ b/modules/addon/lang/fr.lang.php
@@ -11,6 +11,7 @@
     $lang->addon_maker = 'L\'Auteur de la Compagnon';
     $lang->addon_history = 'L\'Histoire de la Compagnon';
 
+    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
     $lang->about_addon = 'La Compagnon, c\'est pour contrôler les actions plutôt d\'imprimer des résultats de HTML.<br/>Par la Touche à Bascule des compagnons que vous voulez faire marcher ou arrêter, vous pouvez appliquer les fonctions très utiles à administrer votre site web.';
 ?>
 
diff --git a/modules/addon/lang/jp.lang.php b/modules/addon/lang/jp.lang.php
index 203d3cd99..081305285 100644
--- a/modules/addon/lang/jp.lang.php
+++ b/modules/addon/lang/jp.lang.php
@@ -11,5 +11,6 @@
     $lang->addon_maker = 'アドオン作者';
     $lang->addon_history = '変更内容';
 
+    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
     $lang->about_addon = 'アドオンは、HTMLの出力をコントロールするというより動作を制御する役割をします。お好みのアドオンを「使用/未使用」に設定するだけでサイトの運営に有用な機能が利用できます。';
 ?>
diff --git a/modules/addon/lang/ko.lang.php b/modules/addon/lang/ko.lang.php
index 7f7908380..5ec6e43f1 100644
--- a/modules/addon/lang/ko.lang.php
+++ b/modules/addon/lang/ko.lang.php
@@ -11,5 +11,6 @@
     $lang->addon_maker = '애드온 제작자';
     $lang->addon_history = '변경 사항 ';
 
+    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
     $lang->about_addon = '애드온은 html결과물을 출력하기 보다 동작을 제어하는 역할을 합니다.<br />원하시는 애드온을 on/ off하시는 것만으로 사이트 운영에 유용한 기능을 연동할 수 있습니다.';
 ?>
diff --git a/modules/addon/lang/ru.lang.php b/modules/addon/lang/ru.lang.php
index b4edea751..c87c767b7 100644
--- a/modules/addon/lang/ru.lang.php
+++ b/modules/addon/lang/ru.lang.php
@@ -11,5 +11,6 @@
     $lang->addon_maker = 'Автор аддона';
     $lang->addon_history = 'История аддона';
 
+    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
     $lang->about_addon = 'Аддон служит больше для контролирования действий, чем для отображения HTML-результатов.<br />Простым включением/выключением любых аддонов, Вы можете использовать очень полезные функции для администрирования Вашего веб-сайта';
 ?>
diff --git a/modules/addon/lang/zh-CN.lang.php b/modules/addon/lang/zh-CN.lang.php
index e228a6ec4..8d62b4780 100644
--- a/modules/addon/lang/zh-CN.lang.php
+++ b/modules/addon/lang/zh-CN.lang.php
@@ -11,5 +11,6 @@
     $lang->addon_maker = '插件作者';
     $lang->addon_history = '更新纪录 ';
 
+    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
     $lang->about_addon = '插件是加载扩展功能的动作，而不是输出结果组件。<br />启用/禁用插件，为网站提供强大的功能。';
 ?>
diff --git a/modules/addon/queries/updateAddon.xml b/modules/addon/queries/updateAddon.xml
index 35883fabf..469cfa9fd 100644
--- a/modules/addon/queries/updateAddon.xml
+++ b/modules/addon/queries/updateAddon.xml
@@ -3,7 +3,7 @@
       <table name="addons" />
     </tables>
     <columns>
-      <column name="is_used" var="is_used" default="Y" />
+      <column name="is_used" var="is_used" />
       <column name="extra_vars" var="extra_vars" />
     </columns>
     <conditions>
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index c1f8fcdfa..6dded9721 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -89,13 +89,7 @@
     <td><a href="{$val->author->homepage}" onclick="window.open(this.href);return false;">{$val->author->name}</a></td>
     <td class="tahoma">{$val->author->date}</td>
     <td class="tahoma">{$val->path}</td>
-    <td>
-        <!--@if($val->extra_vars)-->
-            <a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false" class="blue">{$lang->cmd_setup}</a>
-        <!--@else-->
-            &nbsp;
-        <!--@end-->
-    </td>
+    <td><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false" class="blue">{$lang->cmd_setup}</a></td>
     <td>
         <!--@if($val->activated)-->
         <a href="#" onclick="doToggleAddon('{$val->addon}');return false;" class="blue">{$lang->use}</a>
diff --git a/modules/addon/tpl/css/addon.css b/modules/addon/tpl/css/addon.css
new file mode 100644
index 000000000..44538b135
--- /dev/null
+++ b/modules/addon/tpl/css/addon.css
@@ -0,0 +1,4 @@
+@charset "utf-8";
+
+.module_category_title { border:1px solid #DDDDDD; margin:10px 5px 5px 0; padding:3px 3px 3px 9px; }
+.module_list { margin:0 0 5px 10px; }
diff --git a/modules/addon/tpl/js/addon.js b/modules/addon/tpl/js/addon.js
index c65d1ba66..2189cfaff 100644
--- a/modules/addon/tpl/js/addon.js
+++ b/modules/addon/tpl/js/addon.js
@@ -7,3 +7,11 @@ function doToggleAddon(addon) {
     fo_obj.addon.value = addon;
     procFilter(fo_obj, toggle_activate_addon);
 }
+
+function toggleSectionCheckBox(obj, id) {
+    var box_list = xGetElementsByTagName('input', xGetElementById(id));
+    if(typeof(box_list.length)=='undefined') return;
+    for(var i in box_list) {
+        box_list[i].checked = obj.checked;
+    }
+}
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html
index ff8f76466..19268a677 100644
--- a/modules/addon/tpl/setup_addon.html
+++ b/modules/addon/tpl/setup_addon.html
@@ -1,4 +1,6 @@
 <!--%import("filter/setup_addon.xml")-->
+<!--%import("css/addon.css")-->
+<!--%import("js/addon.js")-->
 
 <div id="popHeadder">
     <h3>{$lang->cmd_setup}</h3>
@@ -26,12 +28,7 @@
 
         <!--@foreach($addon_info->extra_vars as $id => $var)-->
         <tr>
-            <th scope="row">
-                {$var->title}
-                <!--@if($var->type == 'mid_list')-->
-                    <input type="checkbox" onclick="checkboxSelectAll(this.form, '{$var->name}'); return false;" />
-                <!--@end-->
-            </th>
+            <th scope="row">{$var->title}</th>
             <td>
                 <!--@if($var->type == 'text')-->
                 <input type="text" name="{$var->name}" value="{$var->value}" class="inputTypeText w400" />
@@ -45,19 +42,40 @@
                     <option value="{$val->value}"<!--@if($var->value == $val->value)--> selected="selected"<!--@end-->>{$val->title}</option>
                     <!--@end-->
                 </select>
-
-                <!--@elseif($var->type == 'mid_list')-->
-                    <!--@foreach($mid_list as $key => $val)-->
-                <div class="addon_mid_list">
-                    <input type="checkbox" value="{$key}" name="{$var->name}" id="chk_mid_list_{$key}" <!--@if(in_array($key, $var->value))-->checked="checkde" <!--@end-->/>
-                    <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
-                </div>
-                    <!--@end-->
                 <!--@end-->
                 <p class="clear">{nl2br($var->description)}</p>
             </td>
         </tr>
         <!--@end-->
+
+        <tr>
+            <th scope="row">
+                {$lang->module}
+                <input type="checkbox" onclick="checkboxSelectAll(this.form, 'mid_list'); return false;" />
+            </th>
+            <td>
+                <p>{$lang->about_addon_mid}</p>
+                <!--@foreach($mid_list as $module_category_srl => $modules)-->
+                    <div class="module_category_title">
+                        <input type="checkbox" onclick="toggleSectionCheckBox(this, 'section_{$module_category_srl}');" />
+                    <!--@if($modules->title)-->
+                        {$modules->title}
+                    <!--@else-->
+                        &nbsp;
+                    <!--@end-->
+                    </div>
+
+                    <div id="section_{$module_category_srl}">
+                    <!--@foreach($modules->list as $key => $val)-->
+                        <div class="module_list">
+                            <input type="checkbox" value="{$key}" name="mid_list" id="chk_mid_list_{$key}" <!--@if(in_array($key, $addon_info->mid_list))-->checked="checked"<!--@end--> /> 
+                            <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
+                        </div>
+                    <!--@end-->
+                    </div>
+                <!--@end-->
+            </td>
+        </tr>
         </table>
     </div>
 
@@ -67,5 +85,4 @@
             <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
         </div>
     </div>
-
 </form>
diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php
index df2be1447..44e3ae60f 100644
--- a/modules/editor/editor.admin.controller.php
+++ b/modules/editor/editor.admin.controller.php
@@ -88,6 +88,7 @@
             unset($extra_vars->body);
 
             if($extra_vars->target_group) $extra_vars->target_group = explode('|@|', $extra_vars->target_group);
+            if($extra_vars->mid_list) $extra_vars->mid_list = explode('|@|', $extra_vars->mid_list);
 
             $args->component_name = $component_name;
             $args->extra_vars = serialize($extra_vars);
diff --git a/modules/editor/editor.admin.view.php b/modules/editor/editor.admin.view.php
index 128ddfc2b..08bc29c9c 100644
--- a/modules/editor/editor.admin.view.php
+++ b/modules/editor/editor.admin.view.php
@@ -44,6 +44,25 @@
             $group_list = $oMemberModel->getGroups();
             Context::set('group_list', $group_list);
 
+            // mid 목록을 가져옴
+            $oModuleModel = &getModel('module');
+
+            // 모듈 카테고리 목록을 구함
+            $module_categories = $oModuleModel->getModuleCategories();
+
+            $mid_list = $oModuleModel->getMidList();
+
+            // module_category와 module의 조합
+            if($module_categories) {
+                foreach($mid_list as $module_srl => $module) {
+                    $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+                }
+            } else {
+                $module_categories[0]->list = $mid_list;
+            }
+
+            Context::set('mid_list',$module_categories);
+
             $this->setTemplatePath($this->module_path.'tpl');
             $this->setTemplateFile('setup_component');
             $this->setLayoutFile("popup_layout");
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 4d65847bc..1d6ec60de 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -390,6 +390,7 @@
             if(!is_array($db_list)) $db_list = array($db_list);
             foreach($db_list as $component) {
                 if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+
                 $component_name = $component->component_name;
                 if(!$component_name) continue;
 
@@ -421,6 +422,11 @@
                         if(!$is_granted) continue;
                     }
 
+                    // 대상 모듈이 있으면 체크
+                    if($extra_vars->mid_list && count($extra_vars->mid_list) ) {
+                        if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
+                    }
+
                     // 에디터 컴포넌트의 설정 정보를 체크
                     if($xml_info->extra_vars) {
                         foreach($xml_info->extra_vars as $key => $val) {
@@ -474,6 +480,8 @@
 
             $xml_info->target_group = array();
 
+            $xml_info->mid_list = array();
+
             if($component->extra_vars) {
                 $extra_vars = unserialize($component->extra_vars);
 
@@ -482,6 +490,12 @@
                     unset($extra_vars->target_group);
                 }
 
+                if($extra_vars->mid_list) {
+                    $xml_info->mid_list = $extra_vars->mid_list;
+                    unset($extra_vars->mid_list);
+                }
+
+
                 if($xml_info->extra_vars) {
                     foreach($xml_info->extra_vars as $key => $val) {
                         $xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php
index 57de40d54..bcd3f2a0e 100644
--- a/modules/editor/lang/en.lang.php
+++ b/modules/editor/lang/en.lang.php
@@ -16,7 +16,8 @@
     $lang->component_grant = "Permission Setting"; 
 
     $lang->about_component = "About component";
-    $lang->about_component_grant = "Only selected groups are allowed to use. (Everyone can use it when mode is disabled)";
+    $lang->about_component_grant = 'You may set the permission of using expanded components of editor.<br />(Everyone would have permission if nothing checked)';
+    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
 
     $lang->msg_component_is_not_founded = 'Cannot find editor component %s';
     $lang->msg_component_is_inserted = 'Selected component is already inserted';
@@ -40,7 +41,6 @@
     $lang->about_editor_skin = 'You may select the skin of editor.';
     $lang->about_upload_file_grant = 'You may set the permission of file attaching. (Everyone would have permission if nothing checked)';
     $lang->about_default_component_grant = 'You may set the permission of using default components of editor. (Everyone would have permission if nothing checked)';
-    $lang->about_component_grant = 'You may set the permission of using expanded components of editor. (Everyone would have permission if nothing checked)';
     $lang->about_editor_height = 'You may set the height of editor.';
     $lang->about_editor_height_resizable = 'Permit to resize the height of editor.';
     $lang->about_enable_html_grant = 'You may give the permission of using HTML';
diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php
index 8df8d3a90..20b209619 100644
--- a/modules/editor/lang/es.lang.php
+++ b/modules/editor/lang/es.lang.php
@@ -16,7 +16,8 @@
     $lang->component_grant = "Ajuste de las atribuciones"; 
 
     $lang->about_component = "Presentación del componente";
-    $lang->about_component_grant = "Sólo los grupos seleccionados pueden ser usados (Si desactiva el modo se puede usar todos)";
+    $lang->about_component_grant = 'Usted puede configurar el permiso de utilizar la ampliación de los componentes de editor.<br /> (Todo el mundo tendría permiso si no comprobado)';
+    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
 
     $lang->msg_component_is_not_founded = 'No se puede encontrar el componente del editor %s';
     $lang->msg_component_is_inserted = 'El componente seleccionado ya esta insertado';
@@ -40,7 +41,6 @@
     $lang->about_editor_skin = 'Usted puede seleccionar la piel del editor.';
     $lang->about_upload_file_grant = 'Usted puede configurar el permiso de archivo adjunto. (Todo el mundo tendría permiso si no comprobado)';
     $lang->about_default_component_grant = 'Usted puede configurar el permiso de uso de los componentes de editor por defecto. (Todo el mundo tendría permiso si no comprobado)';
-    $lang->about_component_grant = 'Usted puede configurar el permiso de utilizar la ampliación de los componentes de editor. (Todo el mundo tendría permiso si no comprobado)';
     $lang->about_editor_height = 'Usted puede configurar la altura del editor.';
     $lang->about_editor_height_resizable = 'Permiso para cambiar el tamaño de la altura del editor.';
     $lang->about_enable_html_grant = 'Usted puede dar el permiso de uso de HTML';
diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php
index 1e39b15c5..da42d1378 100644
--- a/modules/editor/lang/fr.lang.php
+++ b/modules/editor/lang/fr.lang.php
@@ -16,7 +16,8 @@
     $lang->component_grant = "Configuration de l'Autorisation"; 
 
     $lang->about_component = "Sur le Composant";
-    $lang->about_component_grant = "Le groupe sélectionné peut seulement utiliser. (Tout le monde peut utiliser quand le mode est invalid)";
+    $lang->about_component_grant = 'Vous pouvez configurer l\'autorisation à utiliser des composants tendus de l\'Editeur.<br /> (Tout le monde aura l\'autorisation si vous ne cochez rien)';
+    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
 
     $lang->msg_component_is_not_founded = 'Ne peut pas trouver Composant %s';
     $lang->msg_component_is_inserted = 'Composant choisi est déjà inséré';
@@ -40,7 +41,6 @@
     $lang->about_editor_skin = 'Vous pouvez choisir le thême de l\'Editeur.';
     $lang->about_upload_file_grant = 'Vous pouvez configurer l\'autorisation à télécharger(attacher) les fichiers. (Tout le monde aura l\'autorisation si vous ne cochez rien)';
     $lang->about_default_component_grant = 'Vous pouvez configurer l\'autorisation à utiliser les Composants Par Défaut de l\'Editeur. (Tout le monde aura l\'autorisation si vous ne cochez rien)';
-    $lang->about_component_grant = 'Vous pouvez configurer l\'autorisation à utiliser des composants tendus de l\'Editeur. (Tout le monde aura l\'autorisation si vous ne cochez rien)';
     $lang->about_editor_height = 'Vous pouvez configurer l\'hauteur de l\'Editeur.';
     $lang->about_editor_height_resizable = 'Autoriser à remettre l\'hauteur de l\'Editeur.';
     $lang->about_enable_html_grant = 'Vous pouvez autoriser à utiliser HTML';
diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php
index 08bbe9d9f..e4794928f 100644
--- a/modules/editor/lang/jp.lang.php
+++ b/modules/editor/lang/jp.lang.php
@@ -16,7 +16,8 @@
     $lang->component_grant = "権限設定"; 
 
     $lang->about_component = "コンポーネント情報";
-    $lang->about_component_grant = "選択されたグループでのみ使用できます（すべて解除時はすべて使用可能）。";
+    $lang->about_component_grant = '基本コンポーネント以外の拡張コンポーネント機能が利用可能な権限の設定が出来ます。<br />(選択なしの場合、誰でも利用可能)';
+    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
 
     $lang->msg_component_is_not_founded = '%s エディターのコンポーネントが見つかりません。';
     $lang->msg_component_is_inserted = '選択されたコンポーネントは既に入力されています。';
@@ -40,7 +41,6 @@
     $lang->about_editor_skin = 'エディターのスキンの選択が出来ます。';
     $lang->about_upload_file_grant = 'ファイル添付可能な権限の設定が出来ます。(選択なしの場合、誰でも添付が可能)';
     $lang->about_default_component_grant = 'エディターでの基本コンポーネントを使用可能な権限の設定が出来ます。(選択なしの場合、誰でも利用可能)';
-    $lang->about_component_grant = '基本コンポーネント以外の拡張コンポーネント機能が利用可能な権限の設定が出来ます。(選択なしの場合、誰でも利用可能)';
     $lang->about_editor_height = 'エディターの基本高さを設定します。';
     $lang->about_editor_height_resizable = 'エディターの高さを直接変更出来るようにします。';
     $lang->about_enable_html_grant = 'HTML編集権限を付与します。';
diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php
index 867bd1270..24d9c1572 100644
--- a/modules/editor/lang/ko.lang.php
+++ b/modules/editor/lang/ko.lang.php
@@ -16,7 +16,8 @@
     $lang->component_grant = "권한설정"; 
 
     $lang->about_component = "컴포넌트 소개";
-    $lang->about_component_grant = "선택된 그룹만 사용 가능합니다. (모드 해제시 모두 사용 가능)";
+    $lang->about_component_grant = '기본 컴포넌트외의 확장 컴포넌트 기능을 사용할 수 있는 권한을 지정할 수 있습니다.<br /> (모두 해제시 아무나 사용 가능합니다)';
+    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
 
     $lang->msg_component_is_not_founded = '%s 에디터 컴포넌트를 찾을 수 없습니다';
     $lang->msg_component_is_inserted = '선택하신 컴포넌트는 이미 입력되어 있습니다';
@@ -40,7 +41,6 @@
     $lang->about_editor_skin = '에디터 스킨을 선택하실 수 있습니다';
     $lang->about_upload_file_grant = '파일을 첨부할 수 있는 권한을 지정하실 수 있습니다 (모두 해제시 아무나 첨부 가능합니다)';
     $lang->about_default_component_grant = '에디터에서 사용되는 기본 컴포넌트를 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제시 아무나 사용 가능합니다)';
-    $lang->about_component_grant = '기본 컴포넌트외의 확장 컴포넌트 기능을 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제시 아무나 사용 가능합니다)';
     $lang->about_editor_height = '에디터의 기본 높이를 지정하실 수 있습니다';
     $lang->about_editor_height_resizable = '에디터의 높이를 직접 변경할 수 있도록 허용합니다';
     $lang->about_enable_html_grant = 'HTML편집 권한을 부여할 수 있습니다.';
diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php
index 009f5b040..6f1dab729 100644
--- a/modules/editor/lang/ru.lang.php
+++ b/modules/editor/lang/ru.lang.php
@@ -16,7 +16,8 @@
     $lang->component_grant = "Настройки прав доступа"; 
 
     $lang->about_component = "О компоненте";
-    $lang->about_component_grant = "Только выбранным группам позволено использование. (Каждый может использовать его, если режим выключен)";
+    $lang->about_component_grant = "Только выбранным группам позволено использование.<br /> (Каждый может использовать его, если режим выключен)";
+    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
 
     $lang->msg_component_is_not_founded = 'Невозможно найти компонент редактора %s';
     $lang->msg_component_is_inserted = 'Выбранный компонент уже присутствует';
@@ -40,7 +41,6 @@
     $lang->about_editor_skin = '에디터 스킨을 선택하실 수 있습니다';
     $lang->about_upload_file_grant = '파일을 첨부할 수 있는 권한을 지정하실 수 있습니다 (모두 해제시 아무나 첨부 가능합니다)';
     $lang->about_default_component_grant = '에디터에서 사용되는 기본 컴포넌트를 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제시 아무나 사용 가능합니다)';
-    $lang->about_component_grant = '기본 컴포넌트외의 확장 컴포넌트 기능을 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제시 아무나 사용 가능합니다)';
     $lang->about_editor_height = '에디터의 기본 높이를 지정하실 수 있습니다';
     $lang->about_editor_height_resizable = '에디터의 높이를 직접 변경할 수 있도록 허용합니다';
     $lang->about_enable_html_grant = 'HTML편집 권한을 부여할 수 있습니다.';
diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php
index da5bb2b68..ff92aa4f6 100644
--- a/modules/editor/lang/zh-CN.lang.php
+++ b/modules/editor/lang/zh-CN.lang.php
@@ -16,7 +16,8 @@
     $lang->component_grant = "权限设置"; 
 
     $lang->about_component = "组件简介";
-    $lang->about_component_grant = "指定的用户群才可以使用。 (解除时所有用户群都可以使用)";
+    $lang->about_component_grant = '可以设置除默认组件外的扩展组件使用权限<br />(全部解除时任何用户都可以使用)。';
+    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
 
     $lang->msg_component_is_not_founded = '找不到%s 组件说明！';
     $lang->msg_component_is_inserted = '您选择的组件已插入！';
@@ -40,7 +41,6 @@
     $lang->about_editor_skin = '可以选择编辑器皮肤。';
     $lang->about_upload_file_grant = '可以设置上传文件的权限(全部解除为无限制)。';
     $lang->about_default_component_grant = '可以设置编辑器默认组件的使用权限(全部解除为无限制)。';
-    $lang->about_component_grant = '可以设置除默认组件外的扩展组件使用权限(全部解除时任何用户都可以使用)。';
     $lang->about_editor_height = '可以指定编辑器的默认高度。';
     $lang->about_editor_height_resizable = '允许用户拖动编辑器高度。';
     $lang->about_enable_html_grant = 'HTML代码编辑权限设置。';
diff --git a/modules/editor/tpl/css/editor_admin.css b/modules/editor/tpl/css/editor_admin.css
new file mode 100644
index 000000000..44538b135
--- /dev/null
+++ b/modules/editor/tpl/css/editor_admin.css
@@ -0,0 +1,4 @@
+@charset "utf-8";
+
+.module_category_title { border:1px solid #DDDDDD; margin:10px 5px 5px 0; padding:3px 3px 3px 9px; }
+.module_list { margin:0 0 5px 10px; }
diff --git a/modules/editor/tpl/js/editor_admin.js b/modules/editor/tpl/js/editor_admin.js
index 9f0279e70..4a74514dd 100644
--- a/modules/editor/tpl/js/editor_admin.js
+++ b/modules/editor/tpl/js/editor_admin.js
@@ -34,3 +34,11 @@ function completeUpdate(ret_obj) {
 function doSetupComponent(component_name) {
     popopen("./?module=editor&act=dispEditorAdminSetupComponent&component_name="+component_name, "SetupComponent");
 }
+
+function toggleSectionCheckBox(obj, id) {
+    var box_list = xGetElementsByTagName('input', xGetElementById(id));
+    if(typeof(box_list.length)=='undefined') return;
+    for(var i in box_list) {
+        box_list[i].checked = obj.checked;
+    }
+}
diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html
index bbd8a0016..be77be537 100644
--- a/modules/editor/tpl/setup_component.html
+++ b/modules/editor/tpl/setup_component.html
@@ -1,4 +1,6 @@
 <!--%import("css/editor.css")-->
+<!--%import("css/editor_admin.css")-->
+<!--%import("js/editor_admin.js")-->
 <!--%import("filter/setup_component.xml")-->
 
 <div id="popHeadder">
@@ -38,12 +40,42 @@
         <tr>
             <th scope="row">{$lang->grant}</th>
             <td>
+                <p>{$lang->about_component_grant}</p>
             <!--@foreach($group_list as $key => $val)-->
                 <div class="fl"><input type="checkbox" name="target_group" value="{$key}" <!--@if(in_array($key, $component->target_group))-->checked="checked"<!--@end--> id="group_{$key}"> <label for="group_{$key}">{$val->title}</label> &nbsp;</div>
             <!--@end-->
             </td>
         </tr>
 
+        <tr>
+            <th scope="row">
+                {$lang->module}
+                <input type="checkbox" onclick="checkboxSelectAll(this.form, 'mid_list'); return false;" />
+            </th>
+            <td>
+                <p>{$lang->about_component_mid}</p>
+                <!--@foreach($mid_list as $module_category_srl => $modules)-->
+                    <div class="module_category_title">
+                        <input type="checkbox" onclick="toggleSectionCheckBox(this, 'section_{$module_category_srl}');" />
+                    <!--@if($modules->title)-->
+                        {$modules->title}
+                    <!--@else-->
+                        &nbsp;
+                    <!--@end-->
+                    </div>
+
+                    <div id="section_{$module_category_srl}">
+                    <!--@foreach($modules->list as $key => $val)-->
+                        <div class="module_list">
+                            <input type="checkbox" value="{$key}" name="mid_list" id="chk_mid_list_{$key}" <!--@if(in_array($key, $component->mid_list))-->checked="checked"<!--@end--> /> 
+                            <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
+                        </div>
+                    <!--@end-->
+                    </div>
+                <!--@end-->
+            </td>
+        </tr>
+
         </table>
     </div>
 
diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html
index e08425148..0a3ed9bcd 100644
--- a/modules/widget/tpl/widget_generate_code.html
+++ b/modules/widget/tpl/widget_generate_code.html
@@ -76,6 +76,8 @@
                     <!--@foreach($mid_list as $module_category_srl => $modules)-->
                         <!--@if($modules->title)-->
                             <div class="widget_title">{$modules->title}</div>
+                        <!--@else-->
+                            <div class="widget_title">&nbsp;</div>
                         <!--@end-->
 
                         <!--@foreach($modules->list as $key => $val)-->

From 38eca111165e47c0eb35597bd2f586b8cec20b2f Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 21 Apr 2008 04:59:24 +0000
Subject: [PATCH 028/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4124
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/addon/addon.admin.controller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 54333a371..e4c3ec1f0 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -73,7 +73,6 @@
             }
 
             $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $_m = Context::get(\'mid\'); %s ?>', $buff);
-            debugPrint($buff);
 
             FileHandler::writeFile($this->cache_file, $buff);
         }

From 028d3b26f2c49d05769a193828b002ff9e970c68 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 21 Apr 2008 06:55:20 +0000
Subject: [PATCH 029/111] =?UTF-8?q?yongirl=EB=8B=98=EC=9D=98=20=EC=A7=80?=
 =?UTF-8?q?=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=A0=88=EB=AA=AC=ED=8E=9C=20?=
 =?UTF-8?q?=EC=95=A0=EB=93=9C=EC=98=A8=EC=9D=98=20=EC=86=8C=EC=8A=A4=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A3=BC=EC=84=9D=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
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@4125 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/lemonpen/lemonpen.addon.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/lemonpen/lemonpen.addon.php b/addons/lemonpen/lemonpen.addon.php
index 0b5c7239c..bcd04611a 100644
--- a/addons/lemonpen/lemonpen.addon.php
+++ b/addons/lemonpen/lemonpen.addon.php
@@ -2,14 +2,10 @@
     if(!defined("__ZBXE__")) exit();
 
     /**
-     * @file rainbow.addon.php
+     * @file lemonpen.addon.php
      * @author zero (zero@nzeo.com)
-     * @brief Rainbow link addon
-     *
-     * 링크가 걸린 텍스트에 마우스 오버를 하면 무지개색으로 변하게 하는 애드온입니다.
-     * rainbow.js 파일만 추가하는 것으로 끝납니다.
-     * rainbow.js는 http://www.dynamicdrive.com에서 제작하였으며 저작권을 가지고 있습니다.
-     * before_display_content 에서만 요청이 됩니다.
+     * @brief LemonPen addon
+     * 스프링노트의 레몬펜을 사이트에 설치하는 애드온입니다
      **/
 
     if(Context::getResponseMethod()=="XMLRPC") return;

From 0e38dea1d0c28f601b9bc05b6e8ee288f0e8e716 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 21 Apr 2008 08:24:27 +0000
Subject: [PATCH 030/111] =?UTF-8?q?#455=20module=20instance=EC=9D=98=20con?=
 =?UTF-8?q?structor=ED=98=B8=EC=B6=9C=EC=8B=9C=20trackbackController?=
 =?UTF-8?q?=EC=97=90=20trackback()=EB=9D=BC=EB=8A=94=20method=EB=95=8C?=
 =?UTF-8?q?=EB=AC=B8=EC=97=90=20=EC=83=9D=EA=B8=B0=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=EB=A5=BC=20=EC=88=98=EC=A0=95?=
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@4126 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/module/ModuleHandler.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 979207b5b..0c3867eac 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -335,9 +335,9 @@
                 $oModule->setModulePath($class_path);
 
                 // 요청된 module에 constructor가 있으면 실행
-                if(!isset($GLOBALS['_called_constructor'][$module])) {
-                    $GLOBALS['_called_constructor'][$module] = true;
-                    if(@method_exists($oModule, $module)) $oModule->{$module}();
+                if(!isset($GLOBALS['_called_constructor'][$instance_name])) {
+                    $GLOBALS['_called_constructor'][$instance_name] = true;
+                    if(@method_exists($oModule, $instance_name)) $oModule->{$instance_name}();
                 }
 
                 // GLOBALS 변수에 생성된 객체 저장

From a69193bc500c4aa6a135c5354db5f4a97054ef7c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 22 Apr 2008 03:07:06 +0000
Subject: [PATCH 031/111] =?UTF-8?q?=EC=9D=B4=EC=A0=84=EC=9D=98=20=EC=84=A4?=
 =?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=EB=8A=94=20=EC=96=B4=EC=A9=94=20?=
 =?UTF-8?q?=EC=88=98=20=EC=97=86=EC=9C=BC=EB=82=98=20=EC=8B=A0=EA=B7=9C=20?=
 =?UTF-8?q?=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC=20=EB=B6=80=ED=84=B0?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=84=9C/=EB=8C=93=EA=B8=80=EC=9D=98=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=EB=A5=BC=20trigger=EC=9D=84=20=EC=9D=B4?=
 =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=97=AC=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=EC=97=B0=EA=B2=B0=EB=90=98=EB=8F=84=EB=A1=9D=20=ED=95=98?=
 =?UTF-8?q?=EA=B3=A0=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EC=97=90=EC=84=9C=20=EB=AC=B8=EC=84=9C=20=EB=98=90?=
 =?UTF-8?q?=EB=8A=94=20=EB=8C=93=EA=B8=80=EC=97=90=EC=84=9C=EC=9D=98=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=9C=A0=EB=AC=B4=EB=A5=BC=20=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=ED=95=98=EC=97=AC=20=EC=9B=90=EB=B3=B8=EC=9D=84=20?=
 =?UTF-8?q?=EC=9E=98=20=EC=B0=BE=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
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@4127 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../components/poll_maker/tpl/popup.html      |  1 -
 modules/poll/conf/module.xml                  |  2 +
 modules/poll/poll.admin.model.php             | 22 +++++++
 modules/poll/poll.class.php                   | 18 ++++++
 modules/poll/poll.controller.php              | 62 ++++++++++++++++---
 modules/poll/queries/insertPoll.xml           |  2 +-
 modules/poll/queries/insertPollItem.xml       |  2 +-
 modules/poll/queries/insertPollTitle.xml      |  2 +-
 modules/poll/queries/updatePollItemTarget.xml | 12 ++++
 modules/poll/queries/updatePollTarget.xml     | 11 ++++
 .../poll/queries/updatePollTitleTarget.xml    | 11 ++++
 modules/poll/tpl/js/poll_admin.js             | 18 ++++++
 modules/poll/tpl/poll_list.html               |  3 +-
 13 files changed, 153 insertions(+), 13 deletions(-)
 create mode 100644 modules/poll/queries/updatePollItemTarget.xml
 create mode 100644 modules/poll/queries/updatePollTarget.xml
 create mode 100644 modules/poll/queries/updatePollTitleTarget.xml

diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 4aa1b9675..0033bd2f6 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -27,7 +27,6 @@
 <input type="hidden" name="component" value="{$component_info->component_name}" />
 <input type="hidden" name="method" value="insertPoll" />
 <input type="hidden" name="poll_srl" value="" />
-<input type="hidden" name="editor_sequence" value="{$editor_sequence}" />
 <input type="hidden" name="stop_date" id="stop_date" value="{date("Ymd",time()+60*60*24*30)}" />
 
     <div id="popBody">
diff --git a/modules/poll/conf/module.xml b/modules/poll/conf/module.xml
index 683c8f603..2a10c6d73 100644
--- a/modules/poll/conf/module.xml
+++ b/modules/poll/conf/module.xml
@@ -9,6 +9,8 @@
 
         <action name="getPollGetColorsetList" type="model" standalone="true" />
 
+        <action name="getPollAdminTarget" type="model" standalone="true" />
+
         <action name="procInsert" type="controller" standalone="true" />
         <action name="procPoll" type="controller" standalone="true" />
         <action name="procPollViewResult" type="controller" standalone="true" />
diff --git a/modules/poll/poll.admin.model.php b/modules/poll/poll.admin.model.php
index 30dad4a0a..b6c7df935 100644
--- a/modules/poll/poll.admin.model.php
+++ b/modules/poll/poll.admin.model.php
@@ -24,5 +24,27 @@
             return $output;
         }
 
+        /**
+         * @brief 설문조사의 원본을 구함
+         **/
+        function getPollAdminTarget() {
+            $poll_srl = Context::get('poll_srl');
+            $upload_target_srl = Context::get('upload_target_srl');
+
+            $oDocumentModel = &getModel('document');
+            $oCommentModel = &getModel('comment');
+
+            $oDocument = $oDocumentModel->getDocument($upload_target_srl);
+
+            if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
+
+            if($oComment->isExists()) {
+                $this->add('document_srl', $oComment->get('document_srl'));
+                $this->add('comment_srl', $oComment->get('comment_srl'));
+            } elseif($oDocument->isExists()) {
+                $this->add('document_srl', $oDocument->get('document_srl'));
+            } else return new Object(-1, 'msg_not_founded');
+        }
+
     }
 ?>
diff --git a/modules/poll/poll.class.php b/modules/poll/poll.class.php
index c704e47cf..c92de0974 100644
--- a/modules/poll/poll.class.php
+++ b/modules/poll/poll.class.php
@@ -23,6 +23,10 @@
             $oModuleController->insertModuleConfig('poll', $config);
 
             // 2007. 10. 17 글/댓글의 삭제시 설문조사도 삭제
+            $oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
+            $oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
+            $oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
+            $oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
             $oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
             $oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
 
@@ -36,6 +40,10 @@
             $oModuleModel = &getModel('module');
 
             // 2007. 10. 17 글/댓글의 삭제시 설문조사도 삭제
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
             if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
             if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
 
@@ -55,6 +63,16 @@
             if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
                 $oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
 
+            // 2008. 04. 22 글/댓글의 추가기 설문조사의 연결
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) 
+                $oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) 
+                $oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) 
+                $oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) 
+                $oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
+
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index 53d013e43..4745392e7 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -17,13 +17,6 @@
          * @brief 팝업창에서 설문 작성 완료후 저장을 누를때 설문 등록
          **/
         function procInsert() {
-            // 기본적으로 필요한 변수 설정
-            $editor_sequence = Context::get('editor_sequence');
-
-            // upload_target_srl 구함
-            $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-            if(!$upload_target_srl) $upload_target_srl = getNextSequence();
-
             $stop_date = Context::get('stop_date');
             if($stop_date < date("Ymd")) $stop_date = date("YmdHis", time()+60*60*24*365);
 
@@ -67,7 +60,6 @@
             $poll_args->list_order = $poll_srl*-1;
             $poll_args->stop_date = $args->stop_date;
             $poll_args->poll_count = 0;
-            $poll_args->upload_target_srl = $upload_target_srl;
             $output = executeQuery('poll.insertPoll', $poll_args);
             if(!$output->toBool()) {
                 $oDB->rollback();
@@ -197,6 +189,38 @@
             $this->add('tpl',$tpl);
         }
 
+        /**
+         * @brief 게시글 등록시 poll 연결하는 trigger
+         **/
+        function triggerInsertDocumentPoll(&$obj) {
+            $this->syncPoll($obj->document_srl, $obj->content);
+            return new Object();
+        }
+
+        /**
+         * @brief 댓글 등록시 poll 연결하는 trigger
+         **/
+        function triggerInsertCommentPoll(&$obj) {
+            $this->syncPoll($obj->comment_srl, $obj->content);
+            return new Object();
+        }
+
+        /**
+         * @brief 게시글 수정시 poll 연결하는 trigger
+         **/
+        function triggerUpdateDocumentPoll(&$obj) {
+            $this->syncPoll($obj->document_srl, $obj->content);
+            return new Object();
+        }
+
+        /**
+         * @brief 댓글 등록시 poll 연결하는 trigger
+         **/
+        function triggerUpdateCommentPoll(&$obj) {
+            $this->syncPoll($obj->comment_srl, $obj->content);
+            return new Object();
+        }
+
         /**
          * @brief 게시글 삭제시 poll 삭제하는 trigger
          **/
@@ -260,5 +284,27 @@
 
             return new Object();
         }
+
+        /**
+         * @brief 게시글 내용의 설문조사를 구해와서 문서 번호와 연결 
+         **/
+        function syncPoll($upload_target_srl, $content) {
+            $match_cnt = preg_match_all('!<img([^\>]*)poll_srl=(["\']?)([0-9]*)(["\']?)([^\>]*?)\>!is',$content, $matches);
+            for($i=0;$i<$match_cnt;$i++) {
+                $poll_srl = $matches[3][$i];
+
+                $args = null;
+                $args->poll_srl = $poll_srl;
+                $output = executeQuery('poll.getPoll', $args);
+                $poll = $output->data;
+
+                if($poll->upload_target_srl) continue;
+
+                $args->upload_target_srl = $upload_target_srl;
+                $output = executeQuery('poll.updatePollTarget', $args);
+                $output = executeQuery('poll.updatePollTitleTarget', $args);
+                $output = executeQuery('poll.updatePollItemTarget', $args);
+            }
+        }
     }
 ?>
diff --git a/modules/poll/queries/insertPoll.xml b/modules/poll/queries/insertPoll.xml
index c75bfc37a..a477bf648 100644
--- a/modules/poll/queries/insertPoll.xml
+++ b/modules/poll/queries/insertPoll.xml
@@ -8,7 +8,7 @@
         <column name="member_srl" var="member_srl" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="poll_count" var="poll_count" default="0" />
-        <column name="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
+        <column name="upload_target_srl" default="0" />
         <column name="regdate" var="regdate" default="curdate()" />
         <column name="list_order" var="list_order" default="0" />
     </columns>
diff --git a/modules/poll/queries/insertPollItem.xml b/modules/poll/queries/insertPollItem.xml
index d2fc3c24f..b19209acf 100644
--- a/modules/poll/queries/insertPollItem.xml
+++ b/modules/poll/queries/insertPollItem.xml
@@ -7,7 +7,7 @@
         <column name="poll_srl" var="poll_srl" filter="number" notnull="notnull" />
         <column name="poll_index_srl" var="poll_index_srl" filter="number" notnull="notnull" />
         <column name="poll_count" var="poll_count" default="0" />
-        <column name="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
+        <column name="upload_target_srl" default="0" />
         <column name="title" var="title" notnull="notnull" />
     </columns>
 </query>
diff --git a/modules/poll/queries/insertPollTitle.xml b/modules/poll/queries/insertPollTitle.xml
index 5a2bf83e2..6f57d8d91 100644
--- a/modules/poll/queries/insertPollTitle.xml
+++ b/modules/poll/queries/insertPollTitle.xml
@@ -9,7 +9,7 @@
         <column name="poll_count" var="poll_count" default="0" />
         <column name="checkcount" var="checkcount" notnull="notnull" default="1" />
         <column name="member_srl" var="member_srl" />
-        <column name="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
+        <column name="upload_target_srl" default="0" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="regdate" var="regdate" default="curdate()" />
         <column name="list_order" var="list_order" default="0" />
diff --git a/modules/poll/queries/updatePollItemTarget.xml b/modules/poll/queries/updatePollItemTarget.xml
new file mode 100644
index 000000000..31262f37b
--- /dev/null
+++ b/modules/poll/queries/updatePollItemTarget.xml
@@ -0,0 +1,12 @@
+<query id="updatePollTarget" action="update">
+    <tables>
+        <table name="poll_item" />
+    </tables>
+    <columns>
+        <column name="upload_target_srl" var="upload_target_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="poll_srl" var="poll_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
+
diff --git a/modules/poll/queries/updatePollTarget.xml b/modules/poll/queries/updatePollTarget.xml
new file mode 100644
index 000000000..eae7bfa27
--- /dev/null
+++ b/modules/poll/queries/updatePollTarget.xml
@@ -0,0 +1,11 @@
+<query id="updatePollTarget" action="update">
+    <tables>
+        <table name="poll" />
+    </tables>
+    <columns>
+        <column name="upload_target_srl" var="upload_target_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="poll_srl" var="poll_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/poll/queries/updatePollTitleTarget.xml b/modules/poll/queries/updatePollTitleTarget.xml
new file mode 100644
index 000000000..b708f19d9
--- /dev/null
+++ b/modules/poll/queries/updatePollTitleTarget.xml
@@ -0,0 +1,11 @@
+<query id="updatePollTitleTarget" action="update">
+    <tables>
+        <table name="poll_title" />
+    </tables>
+    <columns>
+        <column name="upload_target_srl" var="upload_target_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="poll_srl" var="poll_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/poll/tpl/js/poll_admin.js b/modules/poll/tpl/js/poll_admin.js
index 32003968c..d73a66de0 100644
--- a/modules/poll/tpl/js/poll_admin.js
+++ b/modules/poll/tpl/js/poll_admin.js
@@ -36,3 +36,21 @@ function completeGetSkinColorset(ret_obj, response_tags, params, fo_obj) {
     sel.selectedIndex = selected_index;
 }
 
+/* 관리자 페이지에서 선택된 설문조사 원본글로 이동하는 함수 */
+function doMovePoll(poll_srl, upload_target_srl) {
+
+    var params = new Array();
+    params['poll_srl'] = poll_srl;
+    params['upload_target_srl'] = upload_target_srl;
+
+    var response_tags = new Array('error','message','document_srl','comment_srl');
+    exec_xml('poll','getPollAdminTarget', params, completeMovePoll, response_tags);
+}
+
+function completeMovePoll(ret_obj, response_tags) {
+    var document_srl = ret_obj['document_srl'];
+    var comment_srl = ret_obj['comment_srl'];
+    var url = request_uri.setQuery('document_srl', document_srl);
+    if(comment_srl) url = url+'#comment_'+comment_srl;
+    winopen(url, 'pollTarget');
+}
diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html
index c5648ee6a..d62b2389a 100644
--- a/modules/poll/tpl/poll_list.html
+++ b/modules/poll/tpl/poll_list.html
@@ -1,4 +1,5 @@
 <!--%import("filter/delete_checked.xml")-->
+<!--%import("js/poll_admin.js")-->
 
 <!--#include("./header.html")-->
 
@@ -82,7 +83,7 @@
     <tr>
         <td class="tahoma">{$no}</td>
         <td><input type="checkbox" name="cart" value="{$val->poll_index_srl}" /></td>
-        <td class="left blue"><a href="{getUrl('','document_srl',$val->upload_target_srl)}" onclick="winopen(this.href); return false;">{htmlspecialchars($val->title)}</a></td>
+        <td class="left blue"><a href="#" onclick="doMovePoll({$val->poll_srl},{$val->upload_target_srl});return false;">{htmlspecialchars($val->title)}</a></td>
         <td class="tahoma">{$val->checkcount}</td>
         <td class="tahoma">{$val->poll_count}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d H:i")}</td>

From 6097f5a5843207de7f1dc49c06c38a179952259a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 22 Apr 2008 03:58:57 +0000
Subject: [PATCH 032/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4128
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/poll/skins/simple/css/poll.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/poll/skins/simple/css/poll.css b/modules/poll/skins/simple/css/poll.css
index c6d1262fc..6e4241ff1 100644
--- a/modules/poll/skins/simple/css/poll.css
+++ b/modules/poll/skins/simple/css/poll.css
@@ -1,18 +1,19 @@
-.simple_poll { table-layout:fixed; width:100%; padding:0; border:none;}
+.simple_poll { table-layout:fixed; padding:0; margin:0; border:none;}
 
 .simple_poll td { padding:0; margin:0; }
 .simple_poll td.title { text-align:right; }
 
 .simple_poll td .itemDiv { border-top:1px solid #BBBBBB; margin-top:3px; padding:3px 0 3px 0; }
-.simple_poll td .title { color:#000000; font-weight:bold; }
+.simple_poll td .title { color:#000000; font-weight:bold; letter-spacing:-1px;}
 .simple_poll td .checkcount { color:#AAAAAA; }
 
-.simple_poll td .item { color:#636363; margin:10px 0 10px 10px; }
+.simple_poll td .item { color:#636363; margin:5px 0 5px 0; }
 .simple_poll td .item input { margin:0; padding:0; }
+.simple_poll td .item label { letter-spacing:-1px; }
 
-.simple_poll td .resultItem { color:#636363; margin:6px 0 0 10px; }
+.simple_poll td .resultItem { color:#636363; margin:6px 0 0 10px; letter-spacing:-1px;}
 
-.simple_poll td .barBox { margin-left:25px; }
+.simple_poll td .barBox { margin-left:10px; }
 .simple_poll td .barBox .bar { margin:3px 0;}
 .simple_poll td .barBox .status {color:#AAAAAA; }
 

From 70f1aa438ab85528364c0ffc1c1a6c617c0e24f3 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 22 Apr 2008 09:41:34 +0000
Subject: [PATCH 033/111] =?UTF-8?q?#459,=20#458=20=EB=B3=B8=EB=AC=B8=20?=
 =?UTF-8?q?=EC=9E=90=EB=8F=99=EB=A7=81=ED=81=AC=20=EB=B0=8F=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=88=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EC=95=A0=EB=93=9C=EC=98=A8?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B6=84=EB=A6=AC?=
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@4129 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/autolink/autolink.addon.php            |  22 ++
 addons/autolink/conf/info.xml                 |  10 +
 addons/autolink/lang/ko.lang.php              |   9 +
 addons/resize_image/conf/info.xml             |  10 +
 addons/resize_image/css/resize_image.css      |   5 +
 addons/resize_image/js/resize_image.js        | 212 +++++++++++++++++
 addons/resize_image/resize_image.addon.php    |  14 ++
 common/css/default.css                        |   4 -
 common/js/common.js                           | 213 ------------------
 .../tpl/images/original_image_box_close.gif   | Bin 610 -> 0 bytes
 modules/comment/comment.item.php              |   2 +-
 modules/document/document.item.php            |   2 +-
 12 files changed, 284 insertions(+), 219 deletions(-)
 create mode 100644 addons/autolink/autolink.addon.php
 create mode 100644 addons/autolink/conf/info.xml
 create mode 100644 addons/autolink/lang/ko.lang.php
 create mode 100644 addons/resize_image/conf/info.xml
 create mode 100644 addons/resize_image/css/resize_image.css
 create mode 100644 addons/resize_image/js/resize_image.js
 create mode 100644 addons/resize_image/resize_image.addon.php
 delete mode 100644 common/tpl/images/original_image_box_close.gif

diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
new file mode 100644
index 000000000..46049ee3e
--- /dev/null
+++ b/addons/autolink/autolink.addon.php
@@ -0,0 +1,22 @@
+<?php
+    if(!defined("__ZBXE__")) exit();
+
+    /**
+     * @file autolink.addon.php
+     * @author zero (zero@nzeo.com)
+     * @brief 자동 링크 애드온
+     **/
+
+    if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
+        Context::loadLang("./addons/autolink/lang");
+        $open_cur_window = Context::getLang('open_cur_window');
+        $open_new_window = Context::getLang('open_new_window');
+
+        $script_code = <<<EndOfScript
+
+    <script type="text/javascript"> function addUrlLink() { var objs = xGetElementsByClassName('xe_content'); if(objs.length<1) return; var rep_list = new Array(); var url_regx = new RegExp("(http|https|ftp|news)://([-/.a-zA-Z0-9_~#%$?&=:200-377()]+)","gi"); for(var i=0;i<objs.length;i++) { var as = xGetElementsByTagName('A', objs[i]); for(var j=0;j<as.length;j++) { xInnerHtml(as[j], xInnerHtml(as[j]).replace('://',';//')); as[j].setAttribute('href', as[j].getAttribute('href').replace('://',';//')); } xInnerHtml(objs[i], xInnerHtml(objs[i]).replace(url_regx, "<a href=\"$1://$2\" onclick=\"window.open(this.href); return false;\">$1://$2</a>")); for(var j=0;j<as.length;j++) { xInnerHtml(as[j], xInnerHtml(as[j]).replace(';//','://')); as[j].setAttribute('href', as[j].getAttribute('href').replace(';//','://')); } xAddEventListener(objs[i], 'mouseover', showUrlOpener); } } function showUrlOpener(e) { var evt = new xEvent(e); var obj = evt.target; var layer = xGetElementById('zbXEUrlOpener'); if(!layer) { layer = xCreateElement('div'); layer.style.position = 'absolute'; layer.style.border = '3px solid #DDDDDD'; layer.style.backgroundColor = '#FFFFFF'; layer.style.padding = '5px'; layer.style.visibility = 'hidden'; layer.style.lineHeight = '1.6'; layer.setAttribute('id','zbXEUrlOpener'); document.body.appendChild(layer); } if(obj && obj.nodeName == 'A' && obj.getAttribute('href') && !/#/.test(obj.getAttribute('href'))) { var href = obj.getAttribute('href'); if(href.length>40) href = href.substr(0,40)+'...'; var html = ''+ '<a href="'+obj.getAttribute('href')+'" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_cur_window}]<br />'+ '<a href="'+obj.getAttribute('href')+'" onclick="window.open(this.href); return false;" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_new_window}]'; xInnerHtml(layer, html); xLeft(layer, evt.pageX-20); xTop(layer, evt.pageY-10); layer.style.visibility = 'visible'; } else { layer.style.visibility = 'hidden'; } } xAddEventListener(window,'load', addUrlLink); </script>
+
+EndOfScript;
+        Context::addHtmlHeader($script_code);
+    }
+?>
diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml
new file mode 100644
index 000000000..8a4a3d62d
--- /dev/null
+++ b/addons/autolink/conf/info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<addon version="0.1">
+  <title xml:lang="ko">자동 링크 애드온</title>
+  <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 22">
+    <name xml:lang="ko">zero</name>
+    <description xml:lang="ko">
+        게시글과 댓글의 내용중 http로 시작되는 일반 문자열에 자동으로 링크를 걸고 각 링크에 마우스 오버시 새창과 현재창 메뉴가 나타나도록 꾸미는 애드온입니다.
+    </description>
+  </author>
+</addon>
diff --git a/addons/autolink/lang/ko.lang.php b/addons/autolink/lang/ko.lang.php
new file mode 100644
index 000000000..8ede9189e
--- /dev/null
+++ b/addons/autolink/lang/ko.lang.php
@@ -0,0 +1,9 @@
+<?php
+    /**
+     * @file   addons/autolink/lang/ko.lang.php
+     * @author zero (zero@zeroboard.com)
+     * @brief  한국어 언어팩 (기본적인 내용만 수록)
+     **/
+    $lang->open_cur_window = "현재창";
+    $lang->open_new_window = "새창";
+?>
diff --git a/addons/resize_image/conf/info.xml b/addons/resize_image/conf/info.xml
new file mode 100644
index 000000000..5b1c7a1f2
--- /dev/null
+++ b/addons/resize_image/conf/info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<addon version="0.1">
+  <title xml:lang="ko">본문내 이미지 조절 애드온</title>
+  <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 22">
+    <name xml:lang="ko">zero</name>
+    <description xml:lang="ko">
+        본문내에 삽입된 이미지의 크기를 본문크기에 맞게 하고 클릭시 원본을 보여주는 애드온입니다.
+    </description>
+  </author>
+</addon>
diff --git a/addons/resize_image/css/resize_image.css b/addons/resize_image/css/resize_image.css
new file mode 100644
index 000000000..2706e2f9b
--- /dev/null
+++ b/addons/resize_image/css/resize_image.css
@@ -0,0 +1,5 @@
+@charset "utf-8";
+
+#forOriginalImageAreaBackground { z-index:1001; background-color:#AAAAAA; top:0px; left:0px; position:relative; padding:0; border:8px solid #444444; white-space:nowrap; }
+#forOriginalImageArea { visibility:hidden; padding:0px; margin:0px; width:100%; height:100%; top:0px; left:0px; position:absolute; z-index:1000; text-align:left; overflow:hidden; background-color:#000000;}
+#fororiginalimage { z-index:1002; margin:0; padding:0; }
diff --git a/addons/resize_image/js/resize_image.js b/addons/resize_image/js/resize_image.js
new file mode 100644
index 000000000..754297b78
--- /dev/null
+++ b/addons/resize_image/js/resize_image.js
@@ -0,0 +1,212 @@
+/**
+ * @brief 화면내에서 상위 영역보다 이미지가 크면 리사이즈를 하고 클릭시 원본을 보여줄수 있도록 변경
+ **/
+function resizeImageContents() {
+    // 일단 모든 이미지에 대한 체크를 시작
+    var objs = xGetElementsByTagName("IMG");
+    for(var i in objs) {
+        var obj = objs[i];
+        if(!obj.parentNode) continue;
+
+        if(/\/modules\//i.test(obj.src)) continue;
+        if(/\/layouts\//i.test(obj.src)) continue;
+        if(/\/widgets\//i.test(obj.src)) continue;
+        if(/\/classes\//i.test(obj.src)) continue;
+        if(/\/common\/tpl\//i.test(obj.src)) continue;
+        if(/\/member_extra_info\//i.test(obj.src)) continue;
+
+        // 상위 node의 className이 document_ 또는 comment_ 로 시작하지 않으면 패스
+        var parent = obj.parentNode;
+        while(parent) {
+            if(parent.className && parent.className.search(/xe_content|document_|comment_/i) != -1) break;
+            parent = parent.parentNode;
+        }
+        if (!parent || parent.className.search(/xe_content|document_|comment_/i) < 0) continue;
+
+        if(parent.parentNode) xWidth(parent, xWidth(parent.parentNode));
+        parent.style.width = '100%';
+        parent.style.overflow = 'hidden';
+
+        var parent_width = xWidth(parent);
+        if(parent.parentNode && xWidth(parent.parentNode)<parent_width) parent_width = xWidth(parent.parentNode);
+        var obj_width = xWidth(obj);
+        var obj_height = xHeight(obj);
+
+        // 만약 선택된 이미지의 가로 크기가 부모의 가로크기보다 크면 리사이즈 (이때 부모의 가로크기 - 2 정도로 지정해줌)
+        if(obj_width > parent_width - 2) {
+            obj.style.cursor = "pointer";
+            var new_w = parent_width - 2;
+            var new_h = Math.round(obj_height * new_w/obj_width);
+            xWidth(obj, new_w);
+            xHeight(obj, new_h);
+            xAddEventListener(obj,"click", showOriginalImage);
+        // 선택된 이미지가 부모보다 작을 경우 일단 원본 이미지를 불러와서 비교
+        } else {
+            var orig_img = new Image();
+            orig_img.src = obj.src;
+            if(orig_img.width > parent_width - 2 || orig_img.width != obj_width) {
+                obj.style.cursor = "pointer";
+                xAddEventListener(obj,"click", showOriginalImage);
+            }
+        }
+    }
+}
+xAddEventListener(window, "load", resizeImageContents);
+
+/**
+ * @brief 본문내에서 컨텐츠 영역보다 큰 이미지의 경우 원본 크기를 보여줌
+ **/
+function showOriginalImage(evt) {
+    var e = new xEvent(evt);
+    var obj = e.target;
+    var src = obj.src;
+
+    if(!xGetElementById("forOriginalImageArea")) {
+        var dummy = xCreateElement("div");
+        dummy.id = "forOriginalImageArea";
+        dummy.style.visibility = "hidden";
+        xInnerHtml(dummy, "<div id=\"forOriginalImageAreaBackground\"><img src=\""+request_uri+"common/tpl/images/blank.gif\" alt=\"original image\" border=\"0\" id=\"fororiginalimage\" /></div>");
+        document.body.appendChild(dummy);
+    }
+
+    var orig_image = xGetElementById("fororiginalimage");
+    var tmp_image = new Image();
+    tmp_image.src = src;
+    var image_width = tmp_image.width;
+    var image_height = tmp_image.height;
+
+    orig_image.style.margin = "0px 0px 0px 0px";
+    orig_image.style.cursor = "move";
+    orig_image.src = src;
+
+    var areabg = xGetElementById("forOriginalImageAreaBackground");
+    xWidth(areabg, image_width+16);
+    xHeight(areabg, image_height+16);
+
+    var area = xGetElementById("forOriginalImageArea");
+    xLeft(area, xScrollLeft());
+    xTop(area, xScrollTop());
+    xWidth(area, xWidth(document));
+    xHeight(area, xHeight(document));
+    area.style.visibility = "visible";
+    var area_width = xWidth(area);
+    var area_height = xHeight(area);
+
+    var x = parseInt((area_width-image_width)/2,10);
+    var y = parseInt((area_height-image_height)/2,10);
+    if(x<0) x = 0;
+    if(y<0) y = 0;
+    xLeft(areabg, x);
+    xTop(areabg, y);
+
+    var sel_list = xGetElementsByTagName("select");
+    for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "hidden";
+
+    xAddEventListener(orig_image, "mousedown", origImageDragEnable);
+    xAddEventListener(orig_image, "dblclick", closeOriginalImage);
+    xAddEventListener(window, "scroll", closeOriginalImage);
+    xAddEventListener(window, "resize", closeOriginalImage);
+    xAddEventListener(document, 'keydown',closeOriginalImage);
+
+    areabg.style.visibility = 'visible';
+}
+
+/**
+ * @brief 원본 이미지 보여준 후 닫는 함수
+ **/
+function closeOriginalImage(evt) {
+    var area = xGetElementById("forOriginalImageArea");
+    if(area.style.visibility != "visible") return;
+    area.style.visibility = "hidden";
+    xGetElementById("forOriginalImageAreaBackground").style.visibility = "hidden";
+
+    var sel_list = xGetElementsByTagName("select");
+    for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "visible";
+
+    xRemoveEventListener(area, "mousedown", closeOriginalImage);
+    xRemoveEventListener(window, "scroll", closeOriginalImage);
+    xRemoveEventListener(window, "resize", closeOriginalImage);
+    xRemoveEventListener(document, 'keydown',closeOriginalImage);
+}
+
+/**
+ * @brief 원본 이미지 드래그
+ **/
+var origDragManager = {obj:null, isDrag:false}
+function origImageDragEnable(evt) {
+    var e = new xEvent(evt);
+    var obj = e.target;
+    if(obj.id != "fororiginalimage") return;
+
+    obj.draggable = true;
+    obj.startX = e.pageX;
+    obj.startY = e.pageY;
+
+    if(!origDragManager.isDrag) {
+        origDragManager.isDrag = true;
+        xAddEventListener(document, "mousemove", origImageDragMouseMove, false);
+    }
+
+    xAddEventListener(document, "mousedown", origImageDragMouseDown, false);
+}
+
+function origImageDrag(obj, px, py) {
+    var x = px - obj.startX;
+    var y = py - obj.startY;
+
+    var areabg = xGetElementById("forOriginalImageAreaBackground");
+    xLeft(areabg, xLeft(areabg)+x);
+    xTop(areabg, xTop(areabg)+y);
+
+    obj.startX = px;
+    obj.startY = py;
+}
+
+function origImageDragMouseDown(evt) {
+    var e = new xEvent(evt);
+    var obj = e.target;
+    if(obj.id != "fororiginalimage" || !obj.draggable) return;
+
+    if(obj) {
+        xPreventDefault(evt);
+        obj.startX = e.pageX;
+        obj.startY = e.pageY;
+        origDragManager.obj = obj;
+        xAddEventListener(document, 'mouseup', origImageDragMouseUp, false);
+        origImageDrag(obj, e.pageX, e.pageY);
+    }
+}
+
+function origImageDragMouseUp(evt) {
+    if(origDragManager.obj) {
+        xPreventDefault(evt);
+        xRemoveEventListener(document, 'mouseup', origImageDragMouseUp, false);
+        xRemoveEventListener(document, 'mousemove', origImageDragMouseMove, false);
+        xRemoveEventListener(document, 'mousemdown', origImageDragMouseDown, false);
+        origDragManager.obj.draggable  = false;
+        origDragManager.obj = null;
+        origDragManager.isDrag = false;
+    }
+}
+
+function origImageDragMouseMove(evt) {
+    var e = new xEvent(evt);
+    var obj = e.target;
+    if(!obj) return;
+    if(obj.id != "fororiginalimage") {
+        xPreventDefault(evt);
+        xRemoveEventListener(document, 'mouseup', origImageDragMouseUp, false);
+        xRemoveEventListener(document, 'mousemove', origImageDragMouseMove, false);
+        xRemoveEventListener(document, 'mousemdown', origImageDragMouseDown, false);
+        origDragManager.obj.draggable  = false;
+        origDragManager.obj = null;
+        origDragManager.isDrag = false;
+        return;
+    }
+
+    xPreventDefault(evt);
+    origDragManager.obj = obj;
+    xAddEventListener(document, 'mouseup', origImageDragMouseUp, false);
+    origImageDrag(obj, e.pageX, e.pageY);
+}
+
diff --git a/addons/resize_image/resize_image.addon.php b/addons/resize_image/resize_image.addon.php
new file mode 100644
index 000000000..3791925ae
--- /dev/null
+++ b/addons/resize_image/resize_image.addon.php
@@ -0,0 +1,14 @@
+<?php
+    if(!defined("__ZBXE__")) exit();
+
+    /**
+     * @file reaize_image.addon.php
+     * @author zero (zero@nzeo.com)
+     * @brief 본문내 이미지 조절 애드온
+     **/
+
+    if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
+        Context::addJsFile('./addons/resize_image/js/resize_image.js');
+        Context::addCSSFile('./addons/resize_image/css/resize_image.css');
+    }
+?>
diff --git a/common/css/default.css b/common/css/default.css
index 6054016b2..6b42ddc60 100644
--- a/common/css/default.css
+++ b/common/css/default.css
@@ -89,10 +89,6 @@ a.bold { font-weight:bold; }
 
 /* xe layer */
 #waitingforserverresponse { border:2px solid #444444; font-weight:bold; color:#444444; padding: 7px 5px 5px 25px; background:#FFFFFF url("../tpl/images/loading.gif") no-repeat 5px 5px; top:40px; left:40px; position:absolute; z-index:100; visibility:hidden; }
-#fororiginalimageareabg { z-index:1001; background-color:#FFFFFF; width:100%; height:100%; top:0px; left:0px; position:relative; padding:20px 10px 10px 10px; border:8px solid #DDDDDD; } 
-#fororiginalimagearea { visibility:hidden; padding:0px; margin:0px; width:100%; height:100%; top:0px; left:0px; position:absolute; z-index:1000; text-align:left; overflow:hidden; }
-#fororiginalimage { z-index:1002; }
-#closeOriginalImageBtn { position:absolute; right:8px; top:5px; cursor:pointer; width:50px; height:12px; z-index:1003; }
 #popup_menu_area { position:absolute; left:0px; top:0px; z-index:1003; visibility:hidden; border:2px solid #D9D9D9; background-color:#FFFFFF; padding:0; }
 #popup_menu_area .box { border:1px solid #CACACA; background-color:#FFFFFF; padding:7px; }
 #popup_menu_area .item { color:#333333; cursor:pointer; margin:0; padding:3px 0 3px 0; white-space:nowrap; }
diff --git a/common/js/common.js b/common/js/common.js
index b9c9a5b67..b4087b404 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -220,62 +220,6 @@ function displayMultimedia(src, width, height, auto_start, flashvars) {
     document.writeln(html);
 }
 
-/**
- * @brief 화면내에서 상위 영역보다 이미지가 크면 리사이즈를 하고 클릭시 원본을 보여줄수 있도록 변경
- **/
-function resizeImageContents() {
-    // 일단 모든 이미지에 대한 체크를 시작
-    var objs = xGetElementsByTagName("IMG");
-    for(var i in objs) {
-        var obj = objs[i];
-        if(!obj.parentNode) continue;
-
-        if(/\/modules\//i.test(obj.src)) continue;
-        if(/\/layouts\//i.test(obj.src)) continue;
-        if(/\/widgets\//i.test(obj.src)) continue;
-        if(/\/classes\//i.test(obj.src)) continue;
-        if(/\/common\/tpl\//i.test(obj.src)) continue;
-        if(/\/member_extra_info\//i.test(obj.src)) continue;
-
-        // 상위 node의 className이 document_ 또는 comment_ 로 시작하지 않으면 패스
-        var parent = obj.parentNode;
-        while(parent) {
-            if(parent.className && parent.className.search(/xe_content|document_|comment_/i) != -1) break;
-            parent = parent.parentNode;
-        }
-        if (!parent || parent.className.search(/xe_content|document_|comment_/i) < 0) continue;
-
-        if(parent.parentNode) xWidth(parent, xWidth(parent.parentNode));
-        parent.style.width = '100%';
-        parent.style.overflow = 'hidden';
-
-
-        var parent_width = xWidth(parent);
-        if(parent.parentNode && xWidth(parent.parentNode)<parent_width) parent_width = xWidth(parent.parentNode);
-        var obj_width = xWidth(obj);
-        var obj_height = xHeight(obj);
-
-        // 만약 선택된 이미지의 가로 크기가 부모의 가로크기보다 크면 리사이즈 (이때 부모의 가로크기 - 2 정도로 지정해줌)
-        if(obj_width > parent_width - 2) {
-            obj.style.cursor = "pointer";
-            var new_w = parent_width - 2;
-            var new_h = Math.round(obj_height * new_w/obj_width);
-            xWidth(obj, new_w);
-            xHeight(obj, new_h);
-            xAddEventListener(obj,"click", showOriginalImage);
-        // 선택된 이미지가 부모보다 작을 경우 일단 원본 이미지를 불러와서 비교
-        } else {
-            var orig_img = new Image();
-            orig_img.src = obj.src;
-            if(orig_img.width > parent_width - 2 || orig_img.width != obj_width) {
-                obj.style.cursor = "pointer";
-                xAddEventListener(obj,"click", showOriginalImage);
-            }
-        }
-    }
-}
-xAddEventListener(window, "load", resizeImageContents);
-
 /**
  * @brief 에디터에서 사용되는 내용 여닫는 코드 (고정, zbxe용)
  **/
@@ -359,163 +303,6 @@ function setFixedPopupSize() {
     window.scrollTo(0,0);
 }
 
-/**
- * @brief 본문내에서 컨텐츠 영역보다 큰 이미지의 경우 원본 크기를 보여줌
- **/
-function showOriginalImage(evt) {
-    var e = new xEvent(evt);
-    var obj = e.target;
-    var src = obj.src;
-
-    if(!xGetElementById("fororiginalimagearea")) {
-        var dummy = xCreateElement("div");
-        dummy.id = "fororiginalimagearea";
-        dummy.style.visibility = "hidden";
-        xInnerHtml(dummy, "<div id=\"fororiginalimageareabg\"><img src=\""+request_uri+"common/tpl/images/blank.gif\" alt=\"original image\" border=\"0\" id=\"fororiginalimage\" /><img src=\""+request_uri+"common/tpl/images/original_image_box_close.gif\" alt=\"close original image\" border=\"0\" onclick=\"closeOriginalImage()\" id=\"closeOriginalImageBtn\"/></div>");
-        document.body.appendChild(dummy);
-    }
-
-    var orig_image = xGetElementById("fororiginalimage");
-    var tmp_image = new Image();
-    tmp_image.src = src;
-    var image_width = tmp_image.width;
-    var image_height = tmp_image.height;
-
-    orig_image.style.margin = "0px 0px 0px 0px";
-    orig_image.style.cursor = "move";
-    orig_image.src = src;
-
-    var areabg = xGetElementById("fororiginalimageareabg");
-    xWidth(areabg, image_width+36);
-    xHeight(areabg, image_height+46);
-
-    var area = xGetElementById("fororiginalimagearea");
-    xLeft(area, xScrollLeft());
-    xTop(area, xScrollTop());
-    xWidth(area, xWidth(document));
-    xHeight(area, xHeight(document));
-    area.style.visibility = "visible";
-    var area_width = xWidth(area);
-    var area_height = xHeight(area);
-
-    var x = parseInt((area_width-image_width)/2,10);
-    var y = parseInt((area_height-image_height)/2,10);
-    if(x<0) x = 0;
-    if(y<0) y = 0;
-    xLeft(areabg, x);
-    xTop(areabg, y);
-
-    var sel_list = xGetElementsByTagName("select");
-    for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "hidden";
-
-    xAddEventListener(orig_image, "mousedown", origImageDragEnable);
-    xAddEventListener(orig_image, "dblclick", closeOriginalImage);
-    xAddEventListener(window, "scroll", closeOriginalImage);
-    xAddEventListener(window, "resize", closeOriginalImage);
-    xAddEventListener(document, 'keydown',closeOriginalImage);
-
-    areabg.style.visibility = 'visible';
-}
-
-/**
- * @brief 원본 이미지 보여준 후 닫는 함수
- **/
-function closeOriginalImage(evt) {
-    var area = xGetElementById("fororiginalimagearea");
-    if(area.style.visibility != "visible") return;
-    area.style.visibility = "hidden";
-    xGetElementById("fororiginalimageareabg").style.visibility = "hidden";
-
-    var sel_list = xGetElementsByTagName("select");
-    for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "visible";
-
-    xRemoveEventListener(area, "mousedown", closeOriginalImage);
-    xRemoveEventListener(window, "scroll", closeOriginalImage);
-    xRemoveEventListener(window, "resize", closeOriginalImage);
-    xRemoveEventListener(document, 'keydown',closeOriginalImage);
-}
-
-/**
- * @brief 원본 이미지 드래그
- **/
-var origDragManager = {obj:null, isDrag:false}
-function origImageDragEnable(evt) {
-    var e = new xEvent(evt);
-    var obj = e.target;
-    if(obj.id != "fororiginalimage") return;
-
-    obj.draggable = true;
-    obj.startX = e.pageX;
-    obj.startY = e.pageY;
-
-    if(!origDragManager.isDrag) {
-        origDragManager.isDrag = true;
-        xAddEventListener(document, "mousemove", origImageDragMouseMove, false);
-    }
-
-    xAddEventListener(document, "mousedown", origImageDragMouseDown, false);
-}
-
-function origImageDrag(obj, px, py) {
-    var x = px - obj.startX;
-    var y = py - obj.startY;
-
-    var areabg = xGetElementById("fororiginalimageareabg");
-    xLeft(areabg, xLeft(areabg)+x);
-    xTop(areabg, xTop(areabg)+y);
-
-    obj.startX = px;
-    obj.startY = py;
-}
-
-function origImageDragMouseDown(evt) {
-    var e = new xEvent(evt);
-    var obj = e.target;
-    if(obj.id != "fororiginalimage" || !obj.draggable) return;
-
-    if(obj) {
-        xPreventDefault(evt);
-        obj.startX = e.pageX;
-        obj.startY = e.pageY;
-        origDragManager.obj = obj;
-        xAddEventListener(document, 'mouseup', origImageDragMouseUp, false);
-        origImageDrag(obj, e.pageX, e.pageY);
-    }
-}
-
-function origImageDragMouseUp(evt) {
-    if(origDragManager.obj) {
-        xPreventDefault(evt);
-        xRemoveEventListener(document, 'mouseup', origImageDragMouseUp, false);
-        xRemoveEventListener(document, 'mousemove', origImageDragMouseMove, false);
-        xRemoveEventListener(document, 'mousemdown', origImageDragMouseDown, false);
-        origDragManager.obj.draggable  = false;
-        origDragManager.obj = null;
-        origDragManager.isDrag = false;
-    }
-}
-
-function origImageDragMouseMove(evt) {
-    var e = new xEvent(evt);
-    var obj = e.target;
-    if(!obj) return;
-    if(obj.id != "fororiginalimage") {
-        xPreventDefault(evt);
-        xRemoveEventListener(document, 'mouseup', origImageDragMouseUp, false);
-        xRemoveEventListener(document, 'mousemove', origImageDragMouseMove, false);
-        xRemoveEventListener(document, 'mousemdown', origImageDragMouseDown, false);
-        origDragManager.obj.draggable  = false;
-        origDragManager.obj = null;
-        origDragManager.isDrag = false;
-        return;
-    }
-
-    xPreventDefault(evt);
-    origDragManager.obj = obj;
-    xAddEventListener(document, 'mouseup', origImageDragMouseUp, false);
-    origImageDrag(obj, e.pageX, e.pageY);
-}
-
 /**
  * @brief 이름, 게시글등을 클릭하였을 경우 팝업 메뉴를 보여주는 함수
  **/
diff --git a/common/tpl/images/original_image_box_close.gif b/common/tpl/images/original_image_box_close.gif
deleted file mode 100644
index b15b3b2dbe1904a0b463f5371d0abe391711c7aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 610
zcmZ?wbhEHbG-BXkc;><I`{$4IGfTD?*q@tGba7twr3JNzYJD%vsn}EOc%ahb_pcvE
z8iS8Cg}lFWVPlSMSE#|+srfVGOb^!wTv^<-tH@z<o?T;rUVDh)`Bf9HZkc;&LEZB+
zyFT2zd}Zy#y(NxKK?W<*t#%YS9<27hFuVNX+^Wl~Ctg}T@o;_MwgUU}vr13)B>w*O
z^JH)G#kEuZ{QA)nq~8&0*c_z)@zM1YT?v1G{d|0Q?d3%c=cX5)=uYekGy47G`+*Ag
z3tJXkTs5IL-0=6$?-y20Xbm#>^Yi<OwQ~;D`t2-qxVwL~qod>h|Nj|=0#N+P!pOkj
z!Jq?jEGSMG*!MShG&Q$0$x60%c6ImkHmP#6+4N1B+M}j!#>nA3ZQe9n7b#XbJFfXF
znq{P09N1V`I4qa9xNmd!*wMOu>z?h~nvAq`Oq(Q>RM<rf7<QlA+PrJm#a3PmMpi{P
zT~2mQSMjqK&Np3ty7Nhs38%3zqYyVUBa`E!$KPK(-m~+!haM9TM~_4S^HJ{VALjzS
zJ5JwGP*f=6X$VkcJJj-1L~qHnf(!i|OfnHWX6P+G*2gRPvf@J`>(cl?4O1se21}iB
HV6X-NjQ!T1

diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index b1229de0d..01e6260f4 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -171,7 +171,7 @@
             $content = $this->get('content');
 
             // url에 대해서 정규표현식으로 치환
-            $content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1<a href="$2://$3" onclick="window.open(this.href);return false;">$2://$3</a>',' '.$content);
+            //$content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1<a href="$2://$3" onclick="window.open(this.href);return false;">$2://$3</a>',' '.$content);
 
             // 이 댓글을... 팝업메뉴를 출력할 경우
             if($add_popup_menu && Context::get('is_logged') ) {
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 6245fc6c1..605a8d6df 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -246,7 +246,7 @@
             $content = $this->get('content');
 
             // url에 대해서 정규표현식으로 치환
-            $content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1<a href="$2://$3" onclick="window.open(this.href);return false;">$2://$3</a>',' '.$content);
+            //$content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1<a href="$2://$3" onclick="window.open(this.href);return false;">$2://$3</a>',' '.$content);
 
             // 이 게시글을... 팝업메뉴를 출력할 경우
             if($add_popup_menu) {

From 52feb9843afac6520ca5c98ccac385d4c235d679 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 22 Apr 2008 09:45:42 +0000
Subject: [PATCH 034/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4130
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/autolink/autolink.addon.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
index 46049ee3e..fe103e281 100644
--- a/addons/autolink/autolink.addon.php
+++ b/addons/autolink/autolink.addon.php
@@ -6,6 +6,7 @@
      * @author zero (zero@nzeo.com)
      * @brief 자동 링크 애드온
      **/
+    return;
 
     if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
         Context::loadLang("./addons/autolink/lang");

From 471fa1d2b0689dca96d4c16466785a6c2fe5faa6 Mon Sep 17 00:00:00 2001
From: rubyeye <rubyeye@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 22 Apr 2008 13:26:16 +0000
Subject: [PATCH 035/111] =?UTF-8?q?#444=20=ED=9A=8C=EC=9B=90=20=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=EC=8B=9C=20=EB=A9=94=EC=9D=BC=20=EC=9D=B8=EC=A6=9D=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.=20=ED=8A=B9=EC=A0=95?=
 =?UTF-8?q?=20=EB=B3=80=EC=88=98=EB=AA=85=20=EB=B3=80=EA=B2=BD=20sended->s?=
 =?UTF-8?q?ent.=20=EA=B8=B4=20=EB=A9=94=EC=8B=9C=EC=A7=80=EC=97=90=20?=
 =?UTF-8?q?=EA=B0=9C=ED=96=89=EB=AC=B8=EC=9E=90=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@4131 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/ko.lang.php               | 12 ++-
 modules/member/member.admin.controller.php    |  2 +-
 modules/member/member.class.php               |  1 +
 modules/member/member.controller.php          | 88 +++++++++++++++++--
 modules/member/queries/chkAuthMail.xml        | 11 +++
 modules/member/queries/insertAuthMail.xml     |  1 +
 .../member/queries/updateMemberPassword.xml   |  1 +
 modules/member/schemas/member_auth_mail.xml   |  1 +
 .../tpl/confirm_member_account_mail.html      | 12 +++
 modules/member/tpl/member_config.html         |  7 ++
 modules/member/tpl/msg_success_authed.html    |  4 +
 11 files changed, 129 insertions(+), 11 deletions(-)
 create mode 100644 modules/member/queries/chkAuthMail.xml
 create mode 100644 modules/member/tpl/confirm_member_account_mail.html

diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 03aca5dd8..02e3a59b0 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -45,6 +45,7 @@
     $lang->signature_max_height = '서명 높이 제한';
     $lang->enable_openid = 'OpenID 지원';
     $lang->enable_join = '회원 가입 허가';
+    $lang->enable_confirm = '메일 인증 사용';
     $lang->enable_ssl = 'SSL 기능 사용';
     $lang->security_sign_in = '보안로그인 사용';
     $lang->limit_day = '임시 제한 일자';
@@ -125,9 +126,14 @@
     $lang->msg_find_account_title = '아이디/ 비밀번호 정보입니다';
     $lang->msg_find_account_info = '요청하신 계정 정보는 아래와 같습니다';
     $lang->msg_find_account_comment = '아래 링크를 클릭하시면 위에 적힌 비밀번호로 바뀌게 됩니다.<br />로그인 하신 후 비밀번호를 바꾸어주세요.';
-    $lang->msg_auth_mail_sended = '%s 메일로 인증 정보를 담은 메일이 발송되었습니다. 메일을 확인하세요.';
+    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
+    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
+    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_auth_mail_sent = '%s 메일로 인증 정보를 담은 메일이 발송되었습니다. 메일을 확인하세요.';
+    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
     $lang->msg_invalid_auth_key = '잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하시거나 사이트 관리자에게 계정 정보를 문의해주세요';
-    $lang->msg_success_authed = '인증이 정상적으로 되어 로그인 처리가 되었습니다. 꼭 인증 메일에 표시된 비밀번호를 이용하여 원하시는 비밀번호로 변경하세요.';
+    $lang->msg_success_authed = '인증이 정상적으로 되어 로그인 처리가 되었습니다.\n꼭 인증 메일에 표시된 비밀번호를 이용하여 원하시는 비밀번호로 변경하세요.';
+    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
 
     $lang->msg_no_message = '쪽지가 없습니다';
     $lang->message_received = '쪽지가 왔습니다';
@@ -159,6 +165,7 @@
     $lang->msg_accept_agreement = '약관에 동의하셔야 합니다'; 
 
     $lang->msg_user_denied = '입력하신 아이디의 사용이 중지되셨습니다';
+    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
     $lang->msg_user_limited = '입력하신 아이디는 %s 이후부터 사용하실 수 있습니다';
 
     $lang->about_user_id = '사용자 ID는 3~20자 사이의 영문+숫자로 이루어져야 하며 영문으로 시작되어야 합니다';
@@ -186,6 +193,7 @@
 
     $lang->about_enable_openid = 'OpenID 지원을 할 경우 체크하시면 됩니다';
     $lang->about_enable_join = '체크를 하셔야 사용자들이 회원가입을 할 수 있습니다';
+    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
     $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = '회원 가입후 정해진 일자동안 인증 제한을 할 수 있습니다';
     $lang->about_limit_date = '지정된 일자까지 해당 사용자는 로그인을 할 수 없습니다';
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index c41b547ab..1920e245c 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -83,7 +83,7 @@
          **/
         function procMemberAdminInsertConfig() {
             // 기본 정보를 받음
-            $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','enable_ssl','limit_day','after_login_url','after_logout_url','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height','editor_skin');
+            $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','enable_confirm','enable_ssl','limit_day','after_login_url','after_logout_url','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height','editor_skin');
             if(!$args->skin) $args->skin = "default";
             if(!$args->colorset) $args->colorset = "white";
             if($args->enable_join!='Y') $args->enable_join = 'N';
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index dbf8f829f..53b1df893 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -81,6 +81,7 @@
             // 기본 정보를 세팅
             $args->enable_join = 'Y';
             if(!$args->enable_openid) $args->enable_openid = 'N';
+            if(!$args->enable_auth_mail) $args->enable_auth_mail = 'N';
             if(!$args->image_name) $args->image_name = 'Y';
             if(!$args->image_mark) $args->image_mark = 'Y';
             if(!$args->profile_image) $args->profile_image = 'Y';
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index c0415e1dd..c69a2782e 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -710,6 +710,9 @@
             unset($all_args->accept_agreement);
             unset($all_args->signature);
 
+            // 메일 인증 기능 사용시 회원 상태를 denied로 설정
+            if ($config->enable_confirm == 'Y') $args->denied = 'Y';
+
             // 모든 request argument에서 필수 정보만 제외 한 후 추가 데이터로 입력
             $extra_vars = delObjectVars($all_args, $args);
             $args->extra_vars = serialize($extra_vars);
@@ -719,11 +722,15 @@
             if(!$output->toBool()) return $output;
 
             // 로그인 시킴
-            $this->doLogin($args->user_id);
+            if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id);
 
             $this->add('member_srl', $args->member_srl);
             if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
-            $this->setMessage('success_registed');
+            if ($config->enable_confirm == 'Y') {
+                $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
+                $this->setMessage($msg);
+            }
+            else $this->setMessage('success_registed');
         }
 
         /**
@@ -1101,11 +1108,19 @@
             // 회원의 정보를 가져옴
             $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 
+            // 아이디/비밀번호 찾기가 가능한 상태의 회원인지 검사
+            if ($member_info->denied == 'Y') {
+                $chk_args->member_srl = $member_info->member_srl;
+                $output = executeQuery('member.chkAuthMail', $chk_args);
+                if ($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
+            }
+
             // 인증 DB에 데이터를 넣음
             $args->user_id = $member_info->user_id;
             $args->member_srl = $member_info->member_srl;
             $args->new_password = rand(111111,999999);
             $args->auth_key = md5( rand(0,999999 ) );
+            $args->is_register = 'N';
 
             $output = executeQuery('member.insertAuthMail', $args);
             if(!$output->toBool()) return $output;
@@ -1129,7 +1144,7 @@
             $oMail->send();
 
             // 메세지 return
-            $msg = sprintf(Context::getLang('msg_auth_mail_sended'), $member_info->email_address);
+            $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
             $this->setMessage($msg);
         }
 
@@ -1150,7 +1165,18 @@
             if(!$output->toBool() || $output->data->auth_key != $auth_key) return $this->stop('msg_invalid_auth_key');
 
             // 인증 정보가 맞다면 새비밀번호로 비밀번호를 바꾸고 인증 상태로 바꿈
-            $args->password = md5($output->data->new_password);
+            if ($output->data->is_register == 'Y') {
+                $args->password = $output->data->new_password;
+                $args->denied = 'N';
+            }
+            else {
+                $args->password = md5($output->data->new_password);
+                unset($args->denied);
+            }
+
+            // $output->data->is_register 값을 백업해 둔다.
+            $is_register = $output->data->is_register;
+
             $output = executeQuery('member.updateMemberPassword', $args);
             if(!$output->toBool()) return $this->stop($output->getMessage());
 
@@ -1175,6 +1201,7 @@
             executeQuery('member.deleteAuthMail',$args);
 
             // 결과를 통보
+            Context::set('is_register', $is_register);
             $this->setTemplatePath($this->module_path.'tpl');
             $this->setTemplateFile('msg_success_authed');
         }
@@ -1274,7 +1301,12 @@
             if($password && !$oMemberModel->isValidPassword($member_info->password, $password)) return new Object(-1, 'invalid_password');
 
             // denied == 'Y' 이면 알림
-            if($member_info->denied == 'Y') return new Object(-1,'msg_user_denied');
+            if($member_info->denied == 'Y') {
+                $args->member_srl = $member_info->member_srl;
+                $output = executeQuery('member.chkAuthMail', $args);
+                if ($output->toBool() && $output->data->count != '0') return new Object(-1,'msg_user_not_confirmed');
+                return new Object(-1,'msg_user_denied');
+            }
 
             // denied_date가 현 시간보다 적으면 알림
             if($member_info->limit_date && $member_info->limit_date >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($member_info->limit_date,"Y-m-d")));
@@ -1380,14 +1412,13 @@
 
             // 필수 변수들의 조절
             if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
+            if($args->denied!='Y') $args->denied = 'N';
             if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message= 'Y';
 
             if($logged_info->is_admin == 'Y') {
-                if($args->denied!='Y') $args->denied = 'N';
                 if($args->is_admin!='Y') $args->is_admin = 'N';
             } else {
                 unset($args->is_admin);
-                unset($args->denied);
             }
 
             list($args->email_id, $args->email_host) = explode('@', $args->email_address);
@@ -1450,6 +1481,40 @@
                 }
             }
 
+            // 메일 인증 모드 사용시(가입된 회원이 denied일 때) 인증 메일 발송
+            if ($args->denied == 'Y') {
+                // 인증 DB에 데이터를 넣음
+                $auth_args->user_id = $args->user_id;
+                $auth_args->member_srl = $args->member_srl;
+                $auth_args->new_password = $args->password;
+                $auth_args->auth_key = md5(rand(0, 999999));
+                $auth_args->is_register = 'Y';
+
+                $output = executeQuery('member.insertAuthMail', $auth_args);
+                if (!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+
+                // 메일 내용을 구함
+                Context::set('auth_args', $auth_args);
+                Context::set('member_info', $args);
+                $oTemplate = &TemplateHandler::getInstance();
+                $content = $oTemplate->compile($this->module_path.'tpl', 'confirm_member_account_mail');
+
+                // 사이트 웹마스터 정보를 구함
+                $oModuleModel = &getModel('module');
+                $member_config = $oModuleModel->getModuleConfig('member');
+
+                // 메일 발송
+                $oMail = new Mail();
+                $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+                $oMail->setContent($content);
+                $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
+                $oMail->setReceiptor( $args->user_name, $args->email_address );
+                $oMail->send();
+            }
+
             // trigger 호출 (after)
             if($output->toBool()) {
                 $trigger_output = ModuleHandler::triggerCall('member.insertMember', 'after', $args);
@@ -1598,8 +1663,15 @@
             $oDB = &DB::getInstance();
             $oDB->begin();
 
-            // member_group_member에서 해당 항목들 삭제
             $args->member_srl = $member_srl;
+            // member_auth_mail에서 해당 항목들 삭제
+            $output = executeQuery('member.deleteAuthMail', $args);
+            if (!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            // member_group_member에서 해당 항목들 삭제
             $output = executeQuery('member.deleteMemberGroupMember', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
diff --git a/modules/member/queries/chkAuthMail.xml b/modules/member/queries/chkAuthMail.xml
new file mode 100644
index 000000000..9505632a9
--- /dev/null
+++ b/modules/member/queries/chkAuthMail.xml
@@ -0,0 +1,11 @@
+<query id="getAuthMail" action="select">
+    <tables>
+        <table name="member_auth_mail" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/insertAuthMail.xml b/modules/member/queries/insertAuthMail.xml
index fcf065f52..465b9a21a 100644
--- a/modules/member/queries/insertAuthMail.xml
+++ b/modules/member/queries/insertAuthMail.xml
@@ -7,6 +7,7 @@
         <column name="user_id" var="user_id" notnull="notnull" />
         <column name="auth_key" var="auth_key" notnull="notnull" minlength="1" maxlength="60" />
         <column name="new_password" var="new_password" notnull="notnull" minlength="1" maxlength="60" />
+        <column name="is_register" var="is_register" default="N" />
         <column name="regdate" default="curdate()" />
     </columns>
 </query>
diff --git a/modules/member/queries/updateMemberPassword.xml b/modules/member/queries/updateMemberPassword.xml
index a4ca62e92..ff3c64fd6 100644
--- a/modules/member/queries/updateMemberPassword.xml
+++ b/modules/member/queries/updateMemberPassword.xml
@@ -4,6 +4,7 @@
     </tables>
     <columns>
         <column name="password" var="password" notnull="notnull" />
+        <column name="denied" var="denied" />
     </columns>
     <conditions>
         <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
diff --git a/modules/member/schemas/member_auth_mail.xml b/modules/member/schemas/member_auth_mail.xml
index 52cbf1fff..d89d5d34d 100644
--- a/modules/member/schemas/member_auth_mail.xml
+++ b/modules/member/schemas/member_auth_mail.xml
@@ -3,5 +3,6 @@
     <column name="member_srl" type="number" size="11" notnull="notnull" unique="unique_key" />
     <column name="user_id" type="varchar" size="80" notnull="notnull" />
     <column name="new_password" type="varchar" size="80" notnull="notnull" />
+    <column name="is_register" type="char" size="1" default="N" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>
diff --git a/modules/member/tpl/confirm_member_account_mail.html b/modules/member/tpl/confirm_member_account_mail.html
new file mode 100644
index 000000000..d2dda240c
--- /dev/null
+++ b/modules/member/tpl/confirm_member_account_mail.html
@@ -0,0 +1,12 @@
+{$lang->msg_confirm_account_info}<br />
+<hr noshade="noshade" />
+<ul>
+    <li>Site : <a href="{getUrl()}" target="_blank">{getUrl()}</a></li>
+    <li>{$lang->user_id} : {$member_info->user_id}</li>
+    <li>{$lang->user_name} : {$member_info->user_name}</li>
+    <li>{$lang->nick_name} : {$member_info->nick_name}</li>
+    <li>{$lang->email_address} : {$member_info->email_address}</li>
+</ul>
+<hr noshade="noshade" />
+{$lang->msg_confirm_account_comment}<br />
+<a href="{getUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key)}" target="_blank">{getUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl,'auth_key',$auth_args->auth_key)}</a>
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html
index d605c1df0..5af5138c8 100644
--- a/modules/member/tpl/member_config.html
+++ b/modules/member/tpl/member_config.html
@@ -37,6 +37,13 @@
             {$lang->about_enable_join}
         </td>
     </tr>
+    <tr>
+        <th scope="row">{$lang->enable_confirm}</th>
+	<td>
+	    <input type="checkbox" name="enable_confirm" value="Y" <!--@if($config->enable_confirm=='Y')-->checked="checked"<!--@end--> class="checkbox" />
+	    {$lang->about_enable_confirm}
+	</td>
+    </tr>
     <tr>
         <th scope="row">{$lang->enable_ssl}</th>
         <td>
diff --git a/modules/member/tpl/msg_success_authed.html b/modules/member/tpl/msg_success_authed.html
index 776c0c8e0..677ef2a9f 100644
--- a/modules/member/tpl/msg_success_authed.html
+++ b/modules/member/tpl/msg_success_authed.html
@@ -1,4 +1,8 @@
 <script type="text/javascript">
+    <!--@if ($is_register == 'Y')-->
+    alert("{$lang->msg_success_confirmed}");
+    <!--@else-->
     alert("{$lang->msg_success_authed}");
+    <!--@end-->
     location.href="{getUrl()}";
 </script>

From 6200cb534a2d1385a87bfb7c78e24a04120d246b Mon Sep 17 00:00:00 2001
From: rubyeye <rubyeye@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 22 Apr 2008 14:04:09 +0000
Subject: [PATCH 036/111] =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=EB=82=98=EB=9D=BC?=
 =?UTF-8?q?=20=EC=96=B8=EC=96=B4=ED=8C=8C=EC=9D=BC=EC=97=90=20ko.lang.php?=
 =?UTF-8?q?=EC=9D=98=20=EB=B3=80=EA=B2=BD=EC=82=AC=ED=95=AD=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
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@4132 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/en.lang.php    | 12 ++++++++++--
 modules/member/lang/es.lang.php    | 11 ++++++++++-
 modules/member/lang/jp.lang.php    | 12 ++++++++++--
 modules/member/lang/ru.lang.php    | 12 ++++++++++--
 modules/member/lang/zh-CN.lang.php | 10 +++++++++-
 5 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index 74ad8fb4e..d8ea42239 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -45,6 +45,7 @@
 	$lang->signature_max_height = 'Max Signature Height';
     $lang->enable_openid = 'Enable OpenID';
     $lang->enable_join = 'Allow Member Join';
+    $lang->enable_confirm = '메일 인증 사용';
     $lang->enable_ssl = 'Enable SSL';
     $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = 'Temporary Limit Date';
@@ -125,9 +126,14 @@
     $lang->msg_find_account_title = 'Account Info';
     $lang->msg_find_account_info = 'This is requested account info.';
     $lang->msg_find_account_comment = 'The password will be modified as above one as you click below link.<br />Please modify the password after login.';
-    $lang->msg_auth_mail_sended = 'The certification mail has been sent to %s. Please check your mail.';
+    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
+    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
+    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_auth_mail_sent = 'The certification mail has been sent to %s. Please check your mail.';
+    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
 	$lang->msg_invalid_auth_key = 'This is an invalid request of certification.<br />Please retry finding account info or contact to administrator.';
-    $lang->msg_success_authed = 'Your account has been successfully certificated and logged on. Please modify the password to your own one with the password in the mail.';
+    $lang->msg_success_authed = 'Your account has been successfully certificated and logged on.\n Please modify the password to your own one with the password in the mail.';
+    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
 
     $lang->msg_no_message = 'There is no message';
     $lang->message_received = 'You have a new message';
@@ -159,6 +165,7 @@
     $lang->msg_accept_agreement = 'You have to agree the agreement'; 
 
     $lang->msg_user_denied = 'You have entered a prohibited ID';
+    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
     $lang->msg_user_limited = 'You have entered an ID that can be used after %s';
 
     $lang->about_user_id = 'User ID should be 3~20 letters long and consist of alphabet+number with alphabet as first letter.';
@@ -186,6 +193,7 @@
 
     $lang->about_enable_openid = 'Allow users to sign up as OpenID';
     $lang->about_enable_join = 'Allow users to sign up';
+    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
     $lang->about_enable_ssl = 'Personal information from Join/Modify Member Info/Login can be sent as SSL(https) mode if server provides SSL service.';
     $lang->about_limit_day = 'You can limit certification date after sign up';
     $lang->about_limit_date = 'User cannot login until assigned date';
diff --git a/modules/member/lang/es.lang.php b/modules/member/lang/es.lang.php
index c09802c44..4ce3d9004 100644
--- a/modules/member/lang/es.lang.php
+++ b/modules/member/lang/es.lang.php
@@ -44,6 +44,7 @@
     $lang->image_mark_max_height = 'Altura Máxima';
     $lang->enable_openid = 'Activar OpenID';
     $lang->enable_join = 'Permitir el registro del usuario';
+    $lang->enable_confirm = '메일 인증 사용';
     $lang->enable_ssl = 'Activar SSL';
     $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = 'Límite de la fecha temporal';
@@ -124,8 +125,14 @@
     $lang->msg_find_account_title = 'Account Info';
     $lang->msg_find_account_info = 'Esto se solicita la información de la cuenta';
     $lang->msg_find_account_comment = 'La contraseña se modificará para arriba al hacer clic en un enlace a continuación. <br /> Por favor, después de modificar la contraseña de acceso.';
-    $lang->msg_auth_mail_sended = 'La autenticación de correo ha sido enviado a% s. Por favor, compruebe su correo.';
+    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
+    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
+    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_auth_mail_sent = 'La autenticación de correo ha sido enviado a% s. Por favor, compruebe su correo.';
+    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
+    $lang->msg_invalid_auth_key = '잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하시거나 사이트 관리자에게 계정 정보를 문의해주세요';
     $lang->msg_success_authed = 'Esto no es válido solicitud de autenticación. <br /> Por favor, inténtelo encontrar información de la cuenta o póngase en contacto con el administrador.';
+    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
 
     $lang->msg_no_message = 'No hay mensajes';
     $lang->message_received = 'Usted ha recibido un mensaje';
@@ -156,6 +163,7 @@
     $lang->msg_accept_agreement = 'Usted primero debe aceptar el acuerdo'; 
 
     $lang->msg_user_denied = 'ID ingresado ha sido prohibido para su uso';
+    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
     $lang->msg_user_limited = 'ID ingresado puede ser usado luego de %s';
 
     $lang->about_user_id = 'ID del usuario debe ser entre 3-20 letras que consiste en alfabetos+número con alfabeto como primera letra.';
@@ -183,6 +191,7 @@
 
     $lang->about_enable_openid = 'Selecciona esta opción si activado OpenID';
     $lang->about_enable_join = 'Debe seleccionar esta opción para permitir el registro de los usuarios';
+    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
     $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = 'Usted puede limitar la fecha de la certificación luego de registrar';
     $lang->about_limit_date = 'Usuario no podra conectarse hasta la fecha indicada';
diff --git a/modules/member/lang/jp.lang.php b/modules/member/lang/jp.lang.php
index 9a04eadb3..ef542bf92 100644
--- a/modules/member/lang/jp.lang.php
+++ b/modules/member/lang/jp.lang.php
@@ -45,6 +45,7 @@
     $lang->signature_max_height = '署名欄の高さの制限';
 	$lang->enable_openid = 'OpenID使用';
     $lang->enable_join = '会員加入を許可する';
+    $lang->enable_confirm = '메일 인증 사용';
     $lang->enable_ssl = 'SSL使用';
     $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = '臨時制限日';
@@ -125,9 +126,14 @@
     $lang->msg_find_account_title = '会員IDどパスワードの情報';
     $lang->msg_find_account_info = '登録された会員情報は下記の通りです。';
     $lang->msg_find_account_comment = '下のリンクをクリックすると上のパスワードに変更されます。<br />ログインしてからパスワードを変更してください。';
-    $lang->msg_auth_mail_sended = '%s メールでは認証情報を含んだ内容が送信されました。 メールを確認してください。';
+    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
+    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
+    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_auth_mail_sent = '%s メールでは認証情報を含んだ内容が送信されました。 メールを確認してください。';
+    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
     $lang->msg_invalid_auth_key = '正しくないアカウントの認証要求です。<br />IDとパスワードの検索を行うか、サイト管理者にアカウント情報をお問い合わせください。';
-    $lang->msg_success_authed = '認証が正常に行われ、ログインできました。必ず認証メールに記載されたパスワードを利用してお好みのパスワードに変更してください。.';
+    $lang->msg_success_authed = '認証が正常に行われ、ログインできました。\n必ず認証メールに記載されたパスワードを利用してお好みのパスワードに変更してください。.';
+    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
 
     $lang->msg_no_message = 'メッセージがありません。';
     $lang->message_received = 'メッセージが届きました。';
@@ -159,6 +165,7 @@
     $lang->msg_accept_agreement = '規約に同意しなければなりません。'; 
 
     $lang->msg_user_denied = '入力されたユーザＩＤは使用が中止されました。';
+    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
     $lang->msg_user_limited = '入力されたユーザＩＤは%s以降から使用できます。';
 
     $lang->about_user_id = 'ユーザＩＤは３～２０の英数文字で構成され、最先頭の文字は英字でなければなりません。';
@@ -186,6 +193,7 @@
 
     $lang->about_enable_openid = 'OpenIDをサポートする際にチェックを入れます。';
     $lang->about_enable_join = 'チェックを入れないとユーザが会員に加入できません。';
+    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
     $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = '会員加入後一定の期間中、認証制限を行うことができます。';
     $lang->about_limit_date = '指定された期間まで該当ユーザはログインできなくします。';
diff --git a/modules/member/lang/ru.lang.php b/modules/member/lang/ru.lang.php
index ce81d2886..462969f6f 100644
--- a/modules/member/lang/ru.lang.php
+++ b/modules/member/lang/ru.lang.php
@@ -44,6 +44,7 @@
     $lang->image_mark_max_height = 'Макс. высота';
     $lang->enable_openid = 'Включить открытый ID (OpenID)';
     $lang->enable_join = 'Позволить пользователям регистрироваться';
+    $lang->enable_confirm = '메일 인증 사용';
     $lang->enable_ssl = 'SSL 기능 사용';
     $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = 'Временный лимит даты';
@@ -123,9 +124,14 @@
     $lang->msg_find_account_title = 'Информация аккаунта';
     $lang->msg_find_account_info = 'Это требуемая информация аккаунта.';
     $lang->msg_find_account_comment = 'Пароль будет изменен на указанный выше после нажатия по ссылке ниже.<br />Пожалуйста, изменить пароль после входа.';
-    $lang->msg_auth_mail_sended = 'Аутентификационное почтовое сообщение было отправлено для %s. Пожалуйста, проверьте Вашу почту.';
+    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
+    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
+    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_auth_mail_sent = 'Аутентификационное почтовое сообщение было отправлено для %s. Пожалуйста, проверьте Вашу почту.';
+    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
 	$lang->msg_invalid_auth_key = 'Неверный запрос на аутентификацию.<br />Пожалуйста, попытайтеть найти информацию аккаунта или свяжитесь с администратором.';
-    $lang->msg_success_authed = 'Ваш аккаунт был успешно аутентифицирован. Вход произведен. Пожалуйста, измените пароль на Ваш собственный.';
+    $lang->msg_success_authed = 'Ваш аккаунт был успешно аутентифицирован.\nВход произведен. Пожалуйста, измените пароль на Ваш собственный.';
+    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
 
     $lang->msg_no_message = 'Нет сообщений';
     $lang->message_received = 'Новое сообщение';
@@ -156,6 +162,7 @@
     $lang->msg_accept_agreement = 'Вы должны принять Соглашение'; 
 
     $lang->msg_user_denied = 'Введенный ID сейчас запрещен';
+    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
     $lang->msg_user_limited = 'Введенный ID может использоваться после %s';
 
     $lang->about_user_id = 'Юзер ID должен быть 3~20 знаков и содержать алфавит или цифры, начинаясь с алфафитного знака.';
@@ -183,6 +190,7 @@
 
     $lang->about_enable_openid = 'Позволить пользователям регистрироваться как OpenID';
     $lang->about_enable_join = 'Позволить пользователям регистрироваться';
+    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
     $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
     $lang->about_limit_day = 'Вы можете ограничить дату сертификации после регистрации';
     $lang->about_limit_date = 'Пользователь не может войти до указанной даты';
diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index 898e5a309..3d8026168 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -45,6 +45,7 @@
     $lang->signature_max_height = '签名高度限制';
     $lang->enable_openid = '支持OpenID';
     $lang->enable_join = '允许会员注册';
+    $lang->enable_confirm = '메일 인증 사용';
     $lang->enable_ssl = '使用SSL功能';
     $lang->security_sign_in = '使用安全登录';
     $lang->limit_day = '认证限制';
@@ -125,9 +126,14 @@
     $lang->msg_find_account_title = '注册信息。';
     $lang->msg_find_account_info = '您要查找的注册信息如下。';
     $lang->msg_find_account_comment = '点击下面的链接您的注册密码将更新为上述的系统自动生成密码。<br />请重新登录后把密码改为您所熟悉的密码。';
-    $lang->msg_auth_mail_sended = '已向%s发送了认证邮件。请确认！！';
+    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
+    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
+    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_auth_mail_sent = '已向%s发送了认证邮件。请确认！！';
+    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
     $lang->msg_invalid_auth_key = '错误的注册信息请求。<br />请重新查找用户名及密码， 或联系管理员。';
     $lang->msg_success_authed = '新的注册信息已得到认证。请用邮件中的新密码修改您要想使用的密码。';
+    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
 
     $lang->msg_no_message = '没有短消息。';
     $lang->message_received = '您有新消息。';
@@ -159,6 +165,7 @@
     $lang->msg_accept_agreement = '您必须同意条款。'; 
 
     $lang->msg_user_denied = '您输入的用户名已禁止使用！';
+    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
     $lang->msg_user_limited = '您输入的用户名%s以后才可以开始使用。';
 
     $lang->about_user_id = '用户名长度必须由 3 ~20 字以内的英文+数字组成，且首个字母必须是英文字母。';
@@ -186,6 +193,7 @@
 
     $lang->about_enable_openid = '要想网站支持OpenID时请勾选此项。';
     $lang->about_enable_join = '选择此项后用户才可以注册。';
+    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
     $lang->about_enable_ssl = '如服务器提供SSL协议服务，新会员注册/修改会员信息/登录等信息的传送将使用SSL(https)协议。';
     $lang->about_limit_day = '注册会员后的认证有效期限。';
     $lang->about_limit_date = '直到指定日期该用户不能登录。';

From b2c7695336f216c254c34362f9368af44b922521 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Tue, 22 Apr 2008 15:15:45 +0000
Subject: [PATCH 037/111] =?UTF-8?q?confirmation=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=98=81=EB=AC=B8=20=EB=B2=88=EC=97=AD?=
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@4133 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/en.lang.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index d8ea42239..e7cecb738 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -42,10 +42,10 @@
     $lang->image_mark = 'Image Mark';
     $lang->image_mark_max_width = 'Max Width';
     $lang->image_mark_max_height = 'Max Height';
-	$lang->signature_max_height = 'Max Signature Height';
+    $lang->signature_max_height = 'Max Signature Height';
     $lang->enable_openid = 'Enable OpenID';
     $lang->enable_join = 'Allow Member Join';
-    $lang->enable_confirm = '메일 인증 사용';
+    $lang->enable_confirm = 'Enable email authentication';
     $lang->enable_ssl = 'Enable SSL';
     $lang->security_sign_in = 'Sign in using enhanced security';
     $lang->limit_day = 'Temporary Limit Date';
@@ -126,14 +126,14 @@
     $lang->msg_find_account_title = 'Account Info';
     $lang->msg_find_account_info = 'This is requested account info.';
     $lang->msg_find_account_comment = 'The password will be modified as above one as you click below link.<br />Please modify the password after login.';
-    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
-    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
-    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_confirm_account_title = 'Authentication confirmation mail';
+    $lang->msg_confirm_account_info = 'This is the registered account information:';
+    $lang->msg_confirm_account_comment = 'Click the following confirmation link to complete your sign up.';
     $lang->msg_auth_mail_sent = 'The certification mail has been sent to %s. Please check your mail.';
-    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
-	$lang->msg_invalid_auth_key = 'This is an invalid request of certification.<br />Please retry finding account info or contact to administrator.';
+    $lang->msg_confirm_mail_sent = 'We just sent you a confirmation email to %s. Click on the confirmation link in the email to complete your sign up.';
+    $lang->msg_invalid_auth_key = 'This is an invalid request of certification.<br />Please retry finding account info or contact to administrator.';
     $lang->msg_success_authed = 'Your account has been successfully certificated and logged on.\n Please modify the password to your own one with the password in the mail.';
-    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
+    $lang->msg_success_confirmed = 'The autentication completed successfully.';
 
     $lang->msg_no_message = 'There is no message';
     $lang->message_received = 'You have a new message';
@@ -165,7 +165,7 @@
     $lang->msg_accept_agreement = 'You have to agree the agreement'; 
 
     $lang->msg_user_denied = 'You have entered a prohibited ID';
-    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
+    $lang->msg_user_not_confirmed = 'You are not authenticated yet. Please check your email.';
     $lang->msg_user_limited = 'You have entered an ID that can be used after %s';
 
     $lang->about_user_id = 'User ID should be 3~20 letters long and consist of alphabet+number with alphabet as first letter.';
@@ -193,7 +193,7 @@
 
     $lang->about_enable_openid = 'Allow users to sign up as OpenID';
     $lang->about_enable_join = 'Allow users to sign up';
-    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
+    $lang->about_enable_confirm = 'Send confirmation email to complete signup.';
     $lang->about_enable_ssl = 'Personal information from Join/Modify Member Info/Login can be sent as SSL(https) mode if server provides SSL service.';
     $lang->about_limit_day = 'You can limit certification date after sign up';
     $lang->about_limit_date = 'User cannot login until assigned date';

From e577ad340abe149c17f0cd2ebf677e1f9032d247 Mon Sep 17 00:00:00 2001
From: rubyeye <rubyeye@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 22 Apr 2008 15:37:57 +0000
Subject: [PATCH 038/111] =?UTF-8?q?member=5Fauth=5Fmail=20=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=EC=97=90=20=EC=B6=94=EA=B0=80=EB=90=9C=20is?=
 =?UTF-8?q?=5Fregister=20=ED=95=84=EB=93=9C=EB=A5=BC=20update=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=B2=98=EB=A6=AC=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
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@4134 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.class.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 53b1df893..560882f67 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -160,6 +160,7 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
 
             // dispMemberOwnDocument act의 여부 체크 (2007. 7. 24 추가)
@@ -194,6 +195,10 @@
             $act = $oModuleModel->getActionForward('dispMemberSavedDocument');
             if(!$act) return true;
 
+            // member_auth_mail 테이블에 is_register 필드 추가 (2008. 04. 22)
+            $act = $oDB->isColumnExists("member_auth_mail", "is_register");
+            if(!$act) return true;
+
             return false;
         }
 
@@ -201,8 +206,10 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            // act 추가
+            $oDB = &DB::getInstance();
             $oModuleController = &getController('module');
+
+            // act 추가
             $oModuleController->insertActionForward('member', 'view', 'dispMemberOwnDocument');
             $oModuleController->insertActionForward('member', 'view', 'dispMemberScrappedDocument');
             $oModuleController->insertActionForward('member', 'view', 'dispMemberSavedDocument');
@@ -218,6 +225,11 @@
             FileHandler::makeDir('./files/member_extra_info/new_message_flags');
             FileHandler::makeDir('./files/member_extra_info/profile_image');
 
+            // DB 필드 추가
+            if (!$oDB->isColumnExists("member_auth_mail", "is_register")) {
+                $oDB->addColumn("member_auth_mail", "is_register", "char", 1, "N", true);
+            }
+
             return new Object(0, 'success_updated');
         }
 

From 125e02c943bfceab82d9a1d834f54627bea619e6 Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 22 Apr 2008 15:49:09 +0000
Subject: [PATCH 039/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=A9=94=EC=9D=BC=20=EB=B6=80=EB=B6=84.?=
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@4135 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/zh-CN.lang.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index 3d8026168..19591af65 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -45,7 +45,7 @@
     $lang->signature_max_height = '签名高度限制';
     $lang->enable_openid = '支持OpenID';
     $lang->enable_join = '允许会员注册';
-    $lang->enable_confirm = '메일 인증 사용';
+    $lang->enable_confirm = '使用邮件认证';
     $lang->enable_ssl = '使用SSL功能';
     $lang->security_sign_in = '使用安全登录';
     $lang->limit_day = '认证限制';
@@ -126,14 +126,14 @@
     $lang->msg_find_account_title = '注册信息。';
     $lang->msg_find_account_info = '您要查找的注册信息如下。';
     $lang->msg_find_account_comment = '点击下面的链接您的注册密码将更新为上述的系统自动生成密码。<br />请重新登录后把密码改为您所熟悉的密码。';
-    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
-    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
-    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
+    $lang->msg_confirm_account_title = '会员注册';
+    $lang->msg_confirm_account_info = '您的注册信息如下:';
+    $lang->msg_confirm_account_comment = '请点击下面链接完成会员认证。';
     $lang->msg_auth_mail_sent = '已向%s发送了认证邮件。请确认！！';
-    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
+    $lang->msg_confirm_mail_sent = '已向%s发送了认证邮件。请确认！！';
     $lang->msg_invalid_auth_key = '错误的注册信息请求。<br />请重新查找用户名及密码， 或联系管理员。';
     $lang->msg_success_authed = '新的注册信息已得到认证。请用邮件中的新密码修改您要想使用的密码。';
-    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
+    $lang->msg_success_confirmed = '注册信息已成功激活！';
 
     $lang->msg_no_message = '没有短消息。';
     $lang->message_received = '您有新消息。';
@@ -165,7 +165,7 @@
     $lang->msg_accept_agreement = '您必须同意条款。'; 
 
     $lang->msg_user_denied = '您输入的用户名已禁止使用！';
-    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
+    $lang->msg_user_not_confirmed = '您的注册信息还没有被激活，请确认您的电子邮箱。';
     $lang->msg_user_limited = '您输入的用户名%s以后才可以开始使用。';
 
     $lang->about_user_id = '用户名长度必须由 3 ~20 字以内的英文+数字组成，且首个字母必须是英文字母。';
@@ -193,7 +193,7 @@
 
     $lang->about_enable_openid = '要想网站支持OpenID时请勾选此项。';
     $lang->about_enable_join = '选择此项后用户才可以注册。';
-    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
+    $lang->about_enable_confirm = '为激活您的注册信息，将向您输入的邮件地址发送注册认证邮件。';
     $lang->about_enable_ssl = '如服务器提供SSL协议服务，新会员注册/修改会员信息/登录等信息的传送将使用SSL(https)协议。';
     $lang->about_limit_day = '注册会员后的认证有效期限。';
     $lang->about_limit_date = '直到指定日期该用户不能登录。';

From 8878b9582d135efa61bd4551374c48c698c81ce0 Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 22 Apr 2008 17:18:25 +0000
Subject: [PATCH 040/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=A9=94=EC=9D=BC=20=EB=B6=80=EB=B6=84=20-?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=EB=90=A8.?=
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@4136 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/lang/zh-CN.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index 19591af65..023d99ef4 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -193,7 +193,7 @@
 
     $lang->about_enable_openid = '要想网站支持OpenID时请勾选此项。';
     $lang->about_enable_join = '选择此项后用户才可以注册。';
-    $lang->about_enable_confirm = '为激活您的注册信息，将向您输入的邮件地址发送注册认证邮件。';
+    $lang->about_enable_confirm = '为激活会员注册信息，将向会员输入的邮件地址发送注册认证邮件。';
     $lang->about_enable_ssl = '如服务器提供SSL协议服务，新会员注册/修改会员信息/登录等信息的传送将使用SSL(https)协议。';
     $lang->about_limit_day = '注册会员后的认证有效期限。';
     $lang->about_limit_date = '直到指定日期该用户不能登录。';

From f3406196189fa7304d9b8f8f2235de744afa0265 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 23 Apr 2008 02:06:16 +0000
Subject: [PATCH 041/111] =?UTF-8?q?digist=5Flytebox=20addon=20=EA=B3=BC=20?=
 =?UTF-8?q?=EC=B6=A9=EB=8F=8C=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
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@4137 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/common.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/js/common.js b/common/js/common.js
index b4087b404..47d17f8cc 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -795,4 +795,8 @@ function toggleSecuritySignIn() {
     else location.href = href.replace(/^http/i,'https');
 }   
 
-
+/* 하위호환성 문제 */
+if(typeof(resizeImageContents) == 'undefined')
+{
+    function resizeImageContents() {}
+}

From f742b03f73133f05a67cac53704d16c0a7c0eaaa Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 23 Apr 2008 06:41:34 +0000
Subject: [PATCH 042/111] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EC=9D=98=20=ED=8F=AC=EC=9D=B8?=
 =?UTF-8?q?=ED=8A=B8=20=ED=98=84=ED=99=A9=EC=9D=84=20=EC=B6=9C=EB=A0=A5?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=9C=84=EC=A0=AF=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@4138 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/common.js                           |  2 +-
 modules/widget/tpl/css/widget.css             |  1 +
 .../tpl/widget_generate_code_in_page.html     |  7 ++-
 widgets/point_status/conf/info.xml            | 11 ++++
 widgets/point_status/point_status.class.php   | 62 +++++++++++++++++++
 widgets/point_status/skins/default/skin.xml   | 18 ++++++
 widgets/point_status/skins/default/status.css | 11 ++++
 .../point_status/skins/default/status.html    | 27 ++++++++
 8 files changed, 137 insertions(+), 2 deletions(-)
 create mode 100644 widgets/point_status/conf/info.xml
 create mode 100644 widgets/point_status/point_status.class.php
 create mode 100644 widgets/point_status/skins/default/skin.xml
 create mode 100644 widgets/point_status/skins/default/status.css
 create mode 100644 widgets/point_status/skins/default/status.html

diff --git a/common/js/common.js b/common/js/common.js
index 47d17f8cc..dc50d4a04 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -210,7 +210,7 @@ function displayMultimedia(src, width, height, auto_start, flashvars) {
             "<param name=\"movie\" value=\""+src+"\" />"+
             "<param name=\"quality\" value=\"high\" />"+
             "<param name=\"flashvars\" value=\""+flashvars+"\" />"+
-            "<embed src=\""+src+"\" autostart=\""+auto_start+"\"  width=\""+width+"\" height=\""+height+"\" wmode=\"transparent\"></embed>"+
+            "<embed src=\""+src+"\" autostart=\""+auto_start+"\"  width=\""+width+"\" height=\""+height+"\" flashvars=\""+flashvars+"\" wmode=\"transparent\"></embed>"+
             "<\/object>";
     } else if(/\.flv/i.test(src)) {
         html = "<embed src=\""+request_uri+"common/tpl/images/flvplayer.swf\" allowfullscreen=\"true\" autostart=\""+auto_start+"\" width=\""+width+"\" height=\""+height+"\" flashvars=\"&file="+src+"&width="+width+"&height="+height+"&autostart="+auto_start+"\" />";
diff --git a/modules/widget/tpl/css/widget.css b/modules/widget/tpl/css/widget.css
index c609c378d..49bff8cdd 100644
--- a/modules/widget/tpl/css/widget.css
+++ b/modules/widget/tpl/css/widget.css
@@ -2,6 +2,7 @@
 
 .widget_title { border:1px solid #DDDDDD; margin:10px 5px 5px 0; padding:3px; }
 .widget_mid_list { margin:0 0 5px 10px; }
+.widget_description { color:#AAAAAA; border-top:1px dotted #EEEEEE; margin:5px 0 0 0; padding:5px 0 0 0; }
 
 #colorset_area { margin-top:.5em; }
 
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index d97f23dee..2c6e2722f 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -25,7 +25,12 @@
         <caption>{nl2br($lang->about_widget_code_in_page)}</caption>
         <tr>
             <th scope="row">{$lang->widget}</th>
-            <td>{$widget_info->title} ver {$widget_info->version}</td>
+            <td>
+                {$widget_info->title} ver {$widget_info->version}
+                <!--@if($widget_info->author->description)-->
+                <div class="widget_description">{nl2br(trim($widget_info->author->description))}</div>
+                <!--@end-->
+            </td>
         </tr>
         <!--@if(count($skin_list))-->
         <tr>
diff --git a/widgets/point_status/conf/info.xml b/widgets/point_status/conf/info.xml
new file mode 100644
index 000000000..0027df8c6
--- /dev/null
+++ b/widgets/point_status/conf/info.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<widget version="0.1">
+    <title xml:lang="ko">포인트 현황 출력 위젯</title>
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 23">
+        <name xml:lang="ko">제로</name>
+        <description xml:lang="ko">
+            로그인한 회원의 포인트 현황을 출력하는 위젯입니다.
+            캐시는 0으로 해주셔야 합니다.
+        </description>
+    </author>
+</widget>
diff --git a/widgets/point_status/point_status.class.php b/widgets/point_status/point_status.class.php
new file mode 100644
index 000000000..47fd800c6
--- /dev/null
+++ b/widgets/point_status/point_status.class.php
@@ -0,0 +1,62 @@
+<?php
+    /**
+     * @class point_status
+     * @author zero (zero@nzeo.com)
+     * @brief 포인트 현황 출력 위젯
+     * @version 0.1
+     **/
+
+    class point_status extends WidgetHandler {
+
+        /**
+         * @brief 위젯의 실행 부분
+         *
+         * ./widgets/위젯/conf/info.xml 에 선언한 extra_vars를 args로 받는다
+         * 결과를 만든후 print가 아니라 return 해주어야 한다
+         **/
+        function proc($args) {
+            // 비로그인 사용자의 경우 결과를 출력하지 않음
+            if(!Context::get('is_logged')) return;
+
+            // 로그인 정보를 구함
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            if(!$member_srl) return;
+
+            // 포인트 관련 설정을 구함
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+
+            // 포인트 내역을 구함
+            $oPointModel = &getModel('point');
+            $widget_info->point = $oPointModel->getPoint($member_srl);
+            $widget_info->level = $oPointModel->getLevel($widget_info->point, $config->level_step);
+            $widget_info->level_icon = sprintf("./modules/point/icons/%s/%d.gif", $config->level_icon, $widget_info->level);
+
+            // 최고 레벨이 아니면 다음 레벨로 가기 위한 per을 구함
+            if($widget_info->level < $config->max_level) {
+                $next_point = $config->level_step[$widget_info->level+1];
+                if($next_point > 0) $per = (int)($widget_info->point / $next_point*100);
+            }
+            $widget_info->per = $per;
+            $widget_info->next_point = $next_point;
+
+            // 단위 설정
+            $widget_info->point_unit = $config->point_name;
+
+            // widget_info를 context setting
+            Context::set('widget_info', $widget_info);
+
+            // 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            Context::set('colorset', $args->colorset);
+
+            // 템플릿 파일을 지정
+            $tpl_file = 'status';
+
+            // 템플릿 컴파일
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+    }
+?>
diff --git a/widgets/point_status/skins/default/skin.xml b/widgets/point_status/skins/default/skin.xml
new file mode 100644
index 000000000..dd001b2e5
--- /dev/null
+++ b/widgets/point_status/skins/default/skin.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skin>
+  <title xml:lang="ko">회원 포인트 현황 기본 스킨</title>
+  <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 23">
+    <name xml:lang="ko">제로</name>
+    <description xml:lang="ko">
+        포인트 현황 출력 위젯의 기본 스킨입니다.
+    </description>
+  </maker>
+  <colorset>
+    <color name="normal">
+      <title xml:lang="ko">기본 컬러</title>
+      <title xml:lang="jp">デフォルトカラー</title>
+      <title xml:lang="zh-CN">默认颜色</title>
+      <title xml:lang="en">Default color</title>
+    </color>
+  </colorset>
+</skin>
diff --git a/widgets/point_status/skins/default/status.css b/widgets/point_status/skins/default/status.css
new file mode 100644
index 000000000..c8c2d2a15
--- /dev/null
+++ b/widgets/point_status/skins/default/status.css
@@ -0,0 +1,11 @@
+.point_status_white .level { font-size:7pt; font-family:tahoma; float:left; color:#333333; }
+.point_status_white .next { font-size:7pt; font-family:tahoma; float:right; color:#979797; }
+.point_status_white .bar_box { background-color:#D9DAF8; height:8px; border:1px solid #2E35D3;  white-space:nowrap; overflow:hidden; margin:3px 0 3px 0;}
+.point_status_white .bar { height:8px; background-color:#6A70E5; border-right:1px solid #2E35D3; white-space:nowrap; overflow:hidden;}
+.point_status_white .point { font-family:tahoma; font-size:8pt; color:#333333; }
+
+.point_status_black .level { font-size:7pt; font-family:tahoma; float:left; color:#BBBBBB; }
+.point_status_black .next { font-size:7pt; font-family:tahoma; float:right; color:#979797; }
+.point_status_black .bar_box { background-color:#D9DAF8; height:8px; border:1px solid #2E35D3;  white-space:nowrap; overflow:hidden; margin:3px 0 3px 0;}
+.point_status_black .bar { height:8px; background-color:#6A70E5; border-right:1px solid #2E35D3; white-space:nowrap; overflow:hidden;}
+.point_status_black .point { font-family:tahoma; font-size:8pt; color:#BBBBBB; }
diff --git a/widgets/point_status/skins/default/status.html b/widgets/point_status/skins/default/status.html
new file mode 100644
index 000000000..24f63f0b9
--- /dev/null
+++ b/widgets/point_status/skins/default/status.html
@@ -0,0 +1,27 @@
+<!--@if($colorset=="black")-->
+    {@ $colorset="black"}
+<!--@else-->
+    {@ $colorset="white"}
+<!--@end-->
+<!--%import("status.css")-->
+
+<div class="point_status_{$colorset}">
+    <div class="level">
+        Lv.<strong>{$widget_info->level}</strong>
+    </div>
+    <div class="next">
+        <strong>{$widget_info->per}%</strong>
+        <span class="next_point">(-{$widget_info->next_point-$widget_info->point})</span>
+    </div>
+
+    <div class="clear"></div>
+
+    <div class="bar_box">
+        <div style="width:{$widget_info->per}%;" class="bar"></div>
+    </div>
+
+    <div class="point">
+        {number_format($widget_info->point)}{$widget_info->point_unit} 
+    </div>
+
+</div>

From 8574cd797fec6340cc25013e09a722d2fba00735 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 23 Apr 2008 09:01:12 +0000
Subject: [PATCH 043/111] =?UTF-8?q?=EC=9E=90=EB=8F=99=EB=A7=81=ED=81=AC=20?=
 =?UTF-8?q?=EC=95=A0=EB=93=9C=EC=98=A8=20=EC=A0=95=EC=83=81=EB=8F=99?=
 =?UTF-8?q?=EC=9E=91=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
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@4139 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/autolink/autolink.addon.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
index fe103e281..a7b7f44cd 100644
--- a/addons/autolink/autolink.addon.php
+++ b/addons/autolink/autolink.addon.php
@@ -6,8 +6,6 @@
      * @author zero (zero@nzeo.com)
      * @brief 자동 링크 애드온
      **/
-    return;
-
     if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
         Context::loadLang("./addons/autolink/lang");
         $open_cur_window = Context::getLang('open_cur_window');
@@ -15,7 +13,9 @@
 
         $script_code = <<<EndOfScript
 
-    <script type="text/javascript"> function addUrlLink() { var objs = xGetElementsByClassName('xe_content'); if(objs.length<1) return; var rep_list = new Array(); var url_regx = new RegExp("(http|https|ftp|news)://([-/.a-zA-Z0-9_~#%$?&=:200-377()]+)","gi"); for(var i=0;i<objs.length;i++) { var as = xGetElementsByTagName('A', objs[i]); for(var j=0;j<as.length;j++) { xInnerHtml(as[j], xInnerHtml(as[j]).replace('://',';//')); as[j].setAttribute('href', as[j].getAttribute('href').replace('://',';//')); } xInnerHtml(objs[i], xInnerHtml(objs[i]).replace(url_regx, "<a href=\"$1://$2\" onclick=\"window.open(this.href); return false;\">$1://$2</a>")); for(var j=0;j<as.length;j++) { xInnerHtml(as[j], xInnerHtml(as[j]).replace(';//','://')); as[j].setAttribute('href', as[j].getAttribute('href').replace(';//','://')); } xAddEventListener(objs[i], 'mouseover', showUrlOpener); } } function showUrlOpener(e) { var evt = new xEvent(e); var obj = evt.target; var layer = xGetElementById('zbXEUrlOpener'); if(!layer) { layer = xCreateElement('div'); layer.style.position = 'absolute'; layer.style.border = '3px solid #DDDDDD'; layer.style.backgroundColor = '#FFFFFF'; layer.style.padding = '5px'; layer.style.visibility = 'hidden'; layer.style.lineHeight = '1.6'; layer.setAttribute('id','zbXEUrlOpener'); document.body.appendChild(layer); } if(obj && obj.nodeName == 'A' && obj.getAttribute('href') && !/#/.test(obj.getAttribute('href'))) { var href = obj.getAttribute('href'); if(href.length>40) href = href.substr(0,40)+'...'; var html = ''+ '<a href="'+obj.getAttribute('href')+'" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_cur_window}]<br />'+ '<a href="'+obj.getAttribute('href')+'" onclick="window.open(this.href); return false;" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_new_window}]'; xInnerHtml(layer, html); xLeft(layer, evt.pageX-20); xTop(layer, evt.pageY-10); layer.style.visibility = 'visible'; } else { layer.style.visibility = 'hidden'; } } xAddEventListener(window,'load', addUrlLink); </script>
+    <script type="text/javascript"> 
+        var url_regx = new RegExp("(http|https|ftp|news)://([-/.a-zA-Z0-9_~#%$?&=:200-377()]+)","gi");  function replaceHrefLink(obj) {  while(obj) {  if(obj.nodeType == 3) {  var text = obj.data;  if(url_regx.test(text)) {  var html = text.replace(url_regx,"<a href=\"$1://$2\" onclick=\"window.open(this.href); return false;\">$1://$2</a>");  var dummy = xCreateElement('span');  xInnerHtml(dummy, html);  obj.parentNode.insertBefore(dummy, obj);  obj.parentNode.removeChild(obj);  }  }  if(obj.firstChild) replaceHrefLink(obj.firstChild);  obj = obj.nextSibling;  }  } function addUrlLink() {   var objs = xGetElementsByClassName('xe_content');  if(objs.length<1) return;  for(var i=0;i<objs.length;i++) {   replaceHrefLink(objs[i].firstChild);  xAddEventListener(objs[i], 'mouseover', showUrlOpener);  }  }  function showUrlOpener(e) {   var evt = new xEvent(e);  var obj = evt.target;  var layer = xGetElementById('zbXEUrlOpener');  if(!layer) {   layer = xCreateElement('div');  layer.style.position = 'absolute';  layer.style.border = '3px solid #DDDDDD';  layer.style.backgroundColor = '#FFFFFF';  layer.style.padding = '5px';  layer.style.visibility = 'hidden';  layer.style.lineHeight = '1.6';  layer.setAttribute('id','zbXEUrlOpener');  document.body.appendChild(layer);  }  if(obj && obj.nodeName == 'A' && obj.getAttribute('href') && !/#/.test(obj.getAttribute('href'))) {   var href = obj.getAttribute('href');  if(href.length>40) href = href.substr(0,40)+'...';  var html = ''+   '<a href="'+obj.getAttribute('href')+'" onclick="window.open(this.href); return false;" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_new_window}]<br />'+  '<a href="'+obj.getAttribute('href')+'" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_cur_window}]'+   '';  xInnerHtml(layer, html);  xLeft(layer, evt.pageX-20);  xTop(layer, evt.pageY-10);  layer.style.visibility = 'visible';  } else {   layer.style.visibility = 'hidden';  }  }   xAddEventListener(window,'load', addUrlLink);   
+    </script>
 
 EndOfScript;
         Context::addHtmlHeader($script_code);

From 09585428264ce153e1c17a57c7859dfdce16da05 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 23 Apr 2008 15:34:26 +0000
Subject: [PATCH 044/111] =?UTF-8?q?ticket:456=20Vote/Blame=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84?=
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@4140 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.class.php           | 20 +++++++++++++++++++
 modules/document/document.controller.php      | 18 ++++++++++++++---
 .../queries/insertDocumentVotedLog.xml        |  1 +
 .../document/queries/updateBlamedCount.xml    | 11 ++++++++++
 .../document/schemas/document_voted_log.xml   |  1 +
 modules/document/schemas/documents.xml        |  1 +
 modules/document/tpl/document_list.html       |  2 +-
 7 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 modules/document/queries/updateBlamedCount.xml

diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index 548badba3..6339c4632 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -31,6 +31,7 @@
             $oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
             $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
             $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+	    $oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
 
             // 2007. 10. 17 모듈이 삭제될때 등록된 글도 모두 삭제하는 트리거 추가
             $oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
@@ -93,6 +94,10 @@
              **/
             if(!$oDB->isColumnExists("documents","extra_vars")) return true;
 
+	    // 2008. 04. 23 blamed count 컬럼 추가
+	    if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
+            if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
+	    if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
 
             return false;
         }
@@ -177,6 +182,21 @@
              **/
             if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
 
+	    // 2008. 04. 23 blamed count 컬럼 추가
+	    if(!$oDB->isColumnExists("documents", "blamed_count")) 
+	    {
+		$oDB->addColumn('documents', 'blamed_count', 'number', 11, 0, true); 
+		$oDB->addIndex('documents', 'idx_blamed_count', array('blamed_count'));
+	    }
+
+            if(!$oDB->isIndexExists("documents","idx_module_blamed_count"))
+	    {
+		$oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
+	    }
+
+	    if(!$oDB->isColumnExists("document_voted_log", "point")) 
+		$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true); 
+
             return new Object(0,'success_updated');
         }
 
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 05f0a13d1..349aa4a73 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -402,17 +402,29 @@
             }
 
             // 추천수 업데이트
-            $args->voted_count = $oDocument->get('voted_count') + $point;
-            $output = executeQuery('document.updateVotedCount', $args);
+	    if($point < 0)
+	    {
+		$args->blamed_count = $oDocument->get('blamed_count') + $point;
+		$output = executeQuery('document.updateBlamedCount', $args);
+	    }
+	    else
+	    {
+		$args->voted_count = $oDocument->get('voted_count') + $point;
+		$output = executeQuery('document.updateVotedCount', $args);
+	    }
 
             // 로그 남기기
+	    $args->point = $point;
             $output = executeQuery('document.insertDocumentVotedLog', $args);
 
             // 세션 정보에 남김
             $_SESSION['voted_document'][$document_srl] = true;
 
             // 결과 리턴
-            return new Object(0, 'success_voted');
+	    if($point > 0)
+		return new Object(0, 'success_voted');
+	    else
+		return new Object(0, 'success_blamed');
         }
 
         /**
diff --git a/modules/document/queries/insertDocumentVotedLog.xml b/modules/document/queries/insertDocumentVotedLog.xml
index 5211b144f..3cd661462 100644
--- a/modules/document/queries/insertDocumentVotedLog.xml
+++ b/modules/document/queries/insertDocumentVotedLog.xml
@@ -7,5 +7,6 @@
         <column name="member_srl" var="member_srl" filter="number" default="0" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="regdate" var="regdate" default="curdate()" />
+	<column name="point" var="point" filter="number" default="0"/>
     </columns>
 </query>
diff --git a/modules/document/queries/updateBlamedCount.xml b/modules/document/queries/updateBlamedCount.xml
new file mode 100644
index 000000000..5f14f6c7a
--- /dev/null
+++ b/modules/document/queries/updateBlamedCount.xml
@@ -0,0 +1,11 @@
+<query id="updateBlamedCount" action="update">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="blamed_count" var="blamed_count" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/document/schemas/document_voted_log.xml b/modules/document/schemas/document_voted_log.xml
index 3d324fe4a..6bd23e7b9 100644
--- a/modules/document/schemas/document_voted_log.xml
+++ b/modules/document/schemas/document_voted_log.xml
@@ -3,4 +3,5 @@
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
     <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
     <column name="regdate" type="date" index="idx_regdate" />
+    <column name="point" type="number" size="11" notnull="notnull" />
 </table>
diff --git a/modules/document/schemas/documents.xml b/modules/document/schemas/documents.xml
index ec6eaf273..290e3b5f1 100644
--- a/modules/document/schemas/documents.xml
+++ b/modules/document/schemas/documents.xml
@@ -10,6 +10,7 @@
     <column name="content" type="bigtext" notnull="notnull" />
     <column name="readed_count" type="number" size="11" default="0" notnull="notnull" index="idx_readed_count" />
     <column name="voted_count" type="number" size="11" default="0" notnull="notnull" index="idx_voted_count" />
+    <column name="blamed_count" type="number" size="11" default="0" notnull="notnull" index="idx_blamed_count" />
     <column name="comment_count" type="number" size="11" default="0" notnull="notnull" index="idx_comment_count" />
     <column name="trackback_count" type="number" size="11" default="0" notnull="notnull" index="idx_trackback_count" />
     <column name="uploaded_count" type="number" size="11" default="0" notnull="notnull" index="idx_uploaded_count" />
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index dc560e808..6f13c3678 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -58,7 +58,7 @@
         <td class="left"><!--@if($oDocument->get('module_srl')!=$oDocument->get('member_srl'))--><a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" class="blue" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}</a><!--@else-->-<!--@end--></td>
         <td class="left"><div class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div></td>
         <td class="tahoma">{$oDocument->get('readed_count')}</td>
-        <td class="tahoma">{$oDocument->get('voted_count')}</td>
+        <td class="tahoma">{$oDocument->get('voted_count')} / {$oDocument->get('blamed_count')}</td>
         <td class="tahoma">{$oDocument->getRegdate("Y-m-d")} {$oDocument->getRegdate("H:i:s")}</td>
     </tr>
     <tr>

From 872e0890e2d6fcbc84f175b21cd2800a238dc125 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 23 Apr 2008 15:35:22 +0000
Subject: [PATCH 045/111] =?UTF-8?q?document=20view=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=B9=84=EC=B6=94=EC=B2=9C=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@4141 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/skins/xe_board/view_document.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/board/skins/xe_board/view_document.html b/modules/board/skins/xe_board/view_document.html
index 3fdc141c8..479e83dee 100644
--- a/modules/board/skins/xe_board/view_document.html
+++ b/modules/board/skins/xe_board/view_document.html
@@ -35,9 +35,9 @@
 
                 <div class="readedCount" title="{$lang->readed_count}">{$oDocument->get('readed_count')}</div>
 
-                <!--@if($oDocument->get('voted_count')!=0)-->
+                <!--@if($oDocument->get('voted_count')!=0 || $oDocument->get('blamed_count')!=0)-->
                 <div class="votedCount" title="{$lang->voted_count}">
-                    <strong>{$oDocument->get('voted_count')}</strong>
+                    <strong>{$oDocument->get('voted_count')} / {$oDocument->get('blamed_count')}</strong>
                 </div>
                 <!--@end-->
 

From 4d51ddc3ee79b57f1b7c73c2a9ffb767a136fc53 Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Thu, 24 Apr 2008 13:35:58 +0000
Subject: [PATCH 046/111] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=20=EC=82=AC=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EC=B5=9C?=
 =?UTF-8?q?=EA=B3=A0=20=EA=B4=80=EB=A6=AC=EC=9E=90=EB=8F=84=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=EA=B0=80=20=EA=B0=80=EB=8A=A5=ED=95=9C=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?=
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@4142 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/tpl/member_info.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html
index 620c21e78..cf69ba194 100644
--- a/modules/member/tpl/member_info.html
+++ b/modules/member/tpl/member_info.html
@@ -178,7 +178,7 @@
 
 <div class="tRight gap1">
     <a href="{getUrl('act','dispMemberAdminInsert')}" class="button"><span>{$lang->cmd_modify}</span></a>
-    <!--@if($val->is_admin!='Y')-->
+    <!--@if($member_info->is_admin!='Y')-->
     <a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl',$member_info->member_srl)}" class="button"><span>{$lang->cmd_delete}</span></a>
     <!--@end-->
     <!--@if($module=="admin")-->

From 56a1809dd0d76bec7221cddcd3af14d9167826a5 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 25 Apr 2008 02:07:25 +0000
Subject: [PATCH 047/111] =?UTF-8?q?=EC=B6=94=EC=B2=9C/=EB=B9=84=EC=B6=94?=
 =?UTF-8?q?=20=EC=96=B8=EC=96=B4=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=A0=81=EC=9A=A9?=
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@4143 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/en.lang.php                  |  2 ++
 common/lang/es.lang.php                  |  2 ++
 common/lang/fr.lang.php                  |  2 ++
 common/lang/jp.lang.php                  |  2 ++
 common/lang/ko.lang.php                  |  2 ++
 common/lang/ru.lang.php                  |  2 ++
 common/lang/zh-CN.lang.php               |  2 ++
 modules/document/document.controller.php | 41 +++++++++++++-----------
 8 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php
index a8966edb7..45a8334aa 100644
--- a/common/lang/en.lang.php
+++ b/common/lang/en.lang.php
@@ -194,6 +194,7 @@
     $lang->success_updated = 'Updated successfully';
     $lang->success_deleted = 'Deleted successfully';
     $lang->success_voted = 'Recommended successfully';
+    $lang->success_blamed = 'Blamed success_blamed';
     $lang->success_moved = 'Moved successfully';
     $lang->success_sended = 'Sent successfully';
     $lang->success_reset = 'Reset successfully';
@@ -204,6 +205,7 @@
     $lang->fail_to_move = 'Could not be moved';
 
     $lang->failed_voted = 'Could not recommend';
+    $lang->failed_blamed = 'Could not blame';
     $lang->failed_declared = 'Could not accuse';
     $lang->fail_to_delete_have_children = 'Please try again after removing replies first';
 
diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php
index 2985acbc3..9873f95fb 100644
--- a/common/lang/es.lang.php
+++ b/common/lang/es.lang.php
@@ -193,6 +193,7 @@
     $lang->success_updated = 'Actualizado con éxito';
     $lang->success_deleted = 'Boarrado con éxito';
     $lang->success_voted = 'Recomendado con éxito';
+    $lang->success_blamed = 'Blamed success_blamed';
     $lang->success_moved = 'Movido con éxito';
     $lang->success_sended = 'Enviado con éxito';
     $lang->success_reset = 'Reajustado con éxito';
@@ -203,6 +204,7 @@
     $lang->fail_to_move = 'No puede ser movido';
 
     $lang->failed_voted = 'No puede ser recomendado';
+    $lang->failed_blamed = 'Could not blame';
     $lang->failed_declared = 'No se ha podido acusar';
     $lang->fail_to_delete_have_children = 'No puede ser borrado, ya que el mensaje posee respuestas ';
 
diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php
index 169945966..692712317 100644
--- a/common/lang/fr.lang.php
+++ b/common/lang/fr.lang.php
@@ -194,6 +194,7 @@
     $lang->success_updated = 'Mise à jour avec succès';
     $lang->success_deleted = 'Supprimé avec succès';
     $lang->success_voted = 'Voté avec succès';
+    $lang->success_blamed = 'Blamed success_blamed';
     $lang->success_moved = 'Bougé avec succès';
     $lang->success_sended = 'Envoyé avec succès';
     $lang->success_reset = 'Restauré avec succès';
@@ -204,6 +205,7 @@
     $lang->fail_to_move = 'N\'a pas pu être bougé';
 
     $lang->failed_voted = 'N\'a pas pu recommander';
+    $lang->failed_blamed = 'Could not blame';
     $lang->failed_declared = 'N\'a pas pu accuser';
     $lang->fail_to_delete_have_children = 'Essayez encore après avoir suprimé les reponses, SVP';
 
diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php
index cb12987ce..66312fbd8 100644
--- a/common/lang/jp.lang.php
+++ b/common/lang/jp.lang.php
@@ -194,6 +194,7 @@
     $lang->success_updated = '修正しました。';
     $lang->success_deleted = '削除しました。';
     $lang->success_voted = '推薦しました。';
+    $lang->success_blamed = 'Blamed success_blamed';
     $lang->success_moved = '移動しました。';
     $lang->success_sended = '送信しました。';
     $lang->success_reset = '初期化しました。';
@@ -204,6 +205,7 @@
     $lang->fail_to_move = '移動に失敗しました。';
 
     $lang->failed_voted = '推薦できません。';
+    $lang->failed_blamed = 'Could not blame';
     $lang->failed_declared = '通報できません。';
     $lang->fail_to_delete_have_children = '返信の書き込みがあり、削除できません。';
 
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index 241db6e65..bdc77a95e 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -194,6 +194,7 @@
     $lang->success_updated = '수정되었습니다';
     $lang->success_deleted = '삭제되었습니다';
     $lang->success_voted = '추천되었습니다';
+    $lang->success_blamed = '비추천되었습니다';
     $lang->success_moved = '이동되었습니다';
     $lang->success_sended = '발송되었습니다';
     $lang->success_reset = '초기화되었습니다';
@@ -204,6 +205,7 @@
     $lang->fail_to_move = '이동 실패하였습니다';
 
     $lang->failed_voted = '추천하실 수 없습니다';
+    $lang->failed_blamed = '비추천하실 수 없습니다';
     $lang->failed_declared = '신고를 하실 수 없습니다';
     $lang->fail_to_delete_have_children = '답글이 있어서 삭제할 수 없습니다';
 
diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php
index b0ecc74c2..5d3e9b705 100644
--- a/common/lang/ru.lang.php
+++ b/common/lang/ru.lang.php
@@ -194,6 +194,7 @@
     $lang->success_updated = 'Обновление успешно';
     $lang->success_deleted = 'Удалено успешно';
     $lang->success_voted = 'Рекомендовано успешно';
+    $lang->success_blamed = 'Blamed success_blamed';
     $lang->success_moved = 'Перемещено успешно';
     $lang->success_sended = 'Отправлено успешно';
     $lang->success_reset = 'Сброшено успешно';
@@ -204,6 +205,7 @@
     $lang->fail_to_move = 'Не может быть перемещено';
 
     $lang->failed_voted = 'Ошибка при рекомендации';
+    $lang->failed_blamed = 'Could not blame';
     $lang->failed_declared = 'Ошибка при обвинении';
     $lang->fail_to_delete_have_children = 'Пожалуйста, попробуйте еще после удаления дочерних объектов';
 
diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
index c428f03fa..52803f03c 100644
--- a/common/lang/zh-CN.lang.php
+++ b/common/lang/zh-CN.lang.php
@@ -194,6 +194,7 @@
     $lang->success_updated = '修改成功！';
     $lang->success_deleted = '删除成功！';
     $lang->success_voted = '推荐成功！';
+    $lang->success_blamed = 'Blamed success_blamed';
     $lang->success_moved = '移动成功！';
     $lang->success_sended = '发送成功！';
     $lang->success_reset = '初始化成功 !';
@@ -204,6 +205,7 @@
     $lang->fail_to_move = '移动成功！';
 	
     $lang->failed_voted = '您不能推荐！';
+    $lang->failed_blamed = 'Could not blame';
     $lang->failed_declared = '您不具备举报权限！';
     $lang->fail_to_delete_have_children = '不能删除有回复的评论！';
 
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 349aa4a73..ff5cedfd2 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -360,8 +360,11 @@
          * @brief 해당 document의 추천수 증가
          **/
         function updateVotedCount($document_srl, $point = 1) {
+            if($point > 0) $failed_voted = 'failed_voted';
+            else $failed_voted = 'failed_blamed';
+
             // 세션 정보에 추천 정보가 있으면 중단
-            if($_SESSION['voted_document'][$document_srl]) return new Object(-1, 'failed_voted');
+            if($_SESSION['voted_document'][$document_srl]) return new Object(-1, $failed_voted);
 
             // 문서 원본을 가져옴
             $oDocumentModel = &getModel('document');
@@ -370,7 +373,7 @@
             // 글의 작성 ip와 현재 접속자의 ip가 동일하면 패스
             if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
                 $_SESSION['voted_document'][$document_srl] = true;
-                return new Object(-1, 'failed_voted');
+                return new Object(-1, $failed_voted);
             }
 
             // document의 작성자가 회원일때 조사
@@ -382,7 +385,7 @@
                 // 글쓴이와 현재 로그인 사용자의 정보가 일치하면 읽었다고 생각하고 세션 등록후 패스
                 if($member_srl && $member_srl == $oDocument->get('member_srl')) {
                     $_SESSION['voted_document'][$document_srl] = true;
-                    return new Object(-1, 'failed_voted');
+                    return new Object(-1, $failed_voted);
                 }
             }
 
@@ -398,33 +401,33 @@
             // 로그 정보에 추천 로그가 있으면 세션 등록후 패스
             if($output->data->count) {
                 $_SESSION['voted_document'][$document_srl] = true;
-                return new Object(-1, 'failed_voted');
+                return new Object(-1, $failed_voted);
             }
 
             // 추천수 업데이트
-	    if($point < 0)
-	    {
-		$args->blamed_count = $oDocument->get('blamed_count') + $point;
-		$output = executeQuery('document.updateBlamedCount', $args);
-	    }
-	    else
-	    {
-		$args->voted_count = $oDocument->get('voted_count') + $point;
-		$output = executeQuery('document.updateVotedCount', $args);
-	    }
+            if($point < 0)
+            {
+                $args->blamed_count = $oDocument->get('blamed_count') + $point;
+                $output = executeQuery('document.updateBlamedCount', $args);
+            }
+            else
+            {
+                $args->voted_count = $oDocument->get('voted_count') + $point;
+                $output = executeQuery('document.updateVotedCount', $args);
+            }
 
             // 로그 남기기
-	    $args->point = $point;
+            $args->point = $point;
             $output = executeQuery('document.insertDocumentVotedLog', $args);
 
             // 세션 정보에 남김
             $_SESSION['voted_document'][$document_srl] = true;
 
             // 결과 리턴
-	    if($point > 0)
-		return new Object(0, 'success_voted');
-	    else
-		return new Object(0, 'success_blamed');
+            if($point > 0)
+                return new Object(0, 'success_voted');
+            else
+                return new Object(0, 'success_blamed');
         }
 
         /**

From 28de28fa02a0f5cfcef9d5fcd0bac1a19f3bd888 Mon Sep 17 00:00:00 2001
From: supershop <supershop@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 25 Apr 2008 10:18:29 +0000
Subject: [PATCH 048/111] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EB=B2=88=EC=97=AD?=
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@4144 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/addon/lang/en.lang.php  | 2 +-
 modules/editor/lang/en.lang.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/addon/lang/en.lang.php b/modules/addon/lang/en.lang.php
index c737da7ba..10cb2ab68 100644
--- a/modules/addon/lang/en.lang.php
+++ b/modules/addon/lang/en.lang.php
@@ -11,6 +11,6 @@
     $lang->addon_maker = 'Author of this Addon';
     $lang->addon_history = 'Addon History';
 
-    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
+    $lang->about_addon_mid = "Addons can select targets.<br />(All targets will be selected when nothing is selected)";
     $lang->about_addon = 'Addon is for controlling actions rather than displaying the HTML results.<br />Simply by toggling any addons you want on or off,  you can use very useful functions to administer your website';
 ?>
diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php
index bcd3f2a0e..a5412c3bc 100644
--- a/modules/editor/lang/en.lang.php
+++ b/modules/editor/lang/en.lang.php
@@ -17,7 +17,7 @@
 
     $lang->about_component = "About component";
     $lang->about_component_grant = 'You may set the permission of using expanded components of editor.<br />(Everyone would have permission if nothing checked)';
-    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
+    $lang->about_component_mid = "Editor components can select targets.<br />(All targets will be selected when nothing is selected)";
 
     $lang->msg_component_is_not_founded = 'Cannot find editor component %s';
     $lang->msg_component_is_inserted = 'Selected component is already inserted';

From 7fa4e5d7c7571a1cbaf9ec91104dff37035b0fbf Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 06:27:32 +0000
Subject: [PATCH 049/111] =?UTF-8?q?@file=20=EC=9D=84=20=EA=B0=81=20?=
 =?UTF-8?q?=EB=82=98=EB=9D=BC=20=EC=96=B8=EC=96=B4=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=EB=AA=85=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95.?=
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@4145 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/components/cc_license/lang/en.lang.php | 2 +-
 modules/editor/components/cc_license/lang/es.lang.php | 4 ++--
 modules/editor/components/cc_license/lang/jp.lang.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/editor/components/cc_license/lang/en.lang.php b/modules/editor/components/cc_license/lang/en.lang.php
index 6838a9a97..9deed7c11 100644
--- a/modules/editor/components/cc_license/lang/en.lang.php
+++ b/modules/editor/components/cc_license/lang/en.lang.php
@@ -1,6 +1,6 @@
 <?php
     /**
-     * @file   /modules/editor/components/cc_license/lang/ko.lang.php
+     * @file   /modules/editor/components/cc_license/lang/en.lang.php
      * @author zero <zero@zeroboard.com>
      * @brief  WYSIWYG module >  CCL display component
      **/
diff --git a/modules/editor/components/cc_license/lang/es.lang.php b/modules/editor/components/cc_license/lang/es.lang.php
index 21fe5a64b..62d8002d1 100644
--- a/modules/editor/components/cc_license/lang/es.lang.php
+++ b/modules/editor/components/cc_license/lang/es.lang.php
@@ -1,11 +1,11 @@
 <?php
     /**
-     * @file   /modules/editor/components/cc_license/lang/ko.lang.php
+     * @file   /modules/editor/components/cc_license/lang/es.lang.php
      * @author zero <zero@zeroboard.com>
      * @brief  WYSIWYG module >  CCL display component
      **/
 
-    $lang->ccl_default_title = 'Creative Commons Corea derechos de autor';
+    $lang->ccl_default_title = 'Reconocimiento-No comercial-Sin obras derivadas 2.0 España';
     $lang->ccl_default_message = 'Este componente puede ser usado por <a rel="licencia" href="http://creativecommons.org/licenses/by% s% s% s% s" onclick="winopen (this.href); retorno false;" >% S% s% s% s </ a> ';
 
     $lang->ccl_title = 'Titulo';
diff --git a/modules/editor/components/cc_license/lang/jp.lang.php b/modules/editor/components/cc_license/lang/jp.lang.php
index 16bee65ab..832cd4fc6 100644
--- a/modules/editor/components/cc_license/lang/jp.lang.php
+++ b/modules/editor/components/cc_license/lang/jp.lang.php
@@ -1,6 +1,6 @@
 <?php
     /**
-     * @file   /modules/editor/components/cc_license/lang/ko.lang.php
+     * @file   /modules/editor/components/cc_license/lang/jp.lang.php
      * @author zero <zero@zeroboard.com> 翻訳：RisaPapa
      * @brief  ウィジウィグエディターモジュール >  CCL 表示エディターコンポーネント
      **/

From 8e4f88da859803526c0c1d74bfc255ca269fe060 Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 06:29:02 +0000
Subject: [PATCH 050/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4146
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/editor/components/emoticon/info.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/editor/components/emoticon/info.xml b/modules/editor/components/emoticon/info.xml
index d2fab388e..dd8eb546f 100644
--- a/modules/editor/components/emoticon/info.xml
+++ b/modules/editor/components/emoticon/info.xml
@@ -17,6 +17,7 @@
         <description xml:lang="jp">顔文字（イモティコン）をエディターに追加することができます。</description>
         <description xml:lang="zh-CN">可以插入表情图标到编辑器。</description>
         <description xml:lang="en">You may insert emoticons to editor.</description>
+		<description xml:lang="es">Usted puede insertar emoticonos para el editor.</description>
         <description xml:lang="ru">Вы можете вставить смыйлы в редактор.</description>
     </author>
 </component>

From c88a98c7a4f65d9b6a97ca4dfa9480f19fbf8cec Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 06:31:55 +0000
Subject: [PATCH 051/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4147
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/autolink/conf/info.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml
index 8a4a3d62d..6726d4b10 100644
--- a/addons/autolink/conf/info.xml
+++ b/addons/autolink/conf/info.xml
@@ -5,6 +5,15 @@
     <name xml:lang="ko">zero</name>
     <description xml:lang="ko">
         게시글과 댓글의 내용중 http로 시작되는 일반 문자열에 자동으로 링크를 걸고 각 링크에 마우스 오버시 새창과 현재창 메뉴가 나타나도록 꾸미는 애드온입니다.
+    </description>
+	    <description xml:lang="es">
+        Los comentarios que comienzan con http naeyongjung tema común de la cadena para vincular automáticamente a colgar el puntero del ratón sobre cada uno de los vínculos y saechang Ciudad y aparecen en el menú de add-on de decoración.
+    </description>
+	    <description xml:lang="ru">
+        Комментарии, которые начинаются с http naeyongjung темой общей строки автоматически ссылку повесить мышь над каждой ссылке и saechang Сити и появляться на меню добавить-на украшения.
+    </description>
+	    <description xml:lang="ge">
+        Kommentare beginnen mit http naeyongjung Thema der gemeinsamen String automatisch Link zu hängen Sie mit der Maus über die einzelnen Links und saechang Stadt und auf dem Menü des Add-On Dekoration.
     </description>
   </author>
 </addon>

From e82073449ddfb886502e63c91371dcb8b8688556 Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 06:33:48 +0000
Subject: [PATCH 052/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4148
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/autolink/conf/info.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml
index 6726d4b10..72cdf8ab3 100644
--- a/addons/autolink/conf/info.xml
+++ b/addons/autolink/conf/info.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <addon version="0.1">
   <title xml:lang="ko">자동 링크 애드온</title>
+  <title xml:lang="es">auto vínculo addon</title>
+  <title xml:lang="ru">авто ссылка аддон</title>
+  <title xml:lang="ge">Auto-Link Addon</title>
   <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 22">
     <name xml:lang="ko">zero</name>
+	<name xml:lang="es">zero</name>
+	<name xml:lang="ru">zero</name>
+	<name xml:lang="ge">zero</name>
     <description xml:lang="ko">
         게시글과 댓글의 내용중 http로 시작되는 일반 문자열에 자동으로 링크를 걸고 각 링크에 마우스 오버시 새창과 현재창 메뉴가 나타나도록 꾸미는 애드온입니다.
     </description>

From 675b6711f0dbe446682833d98804bc4f6975a232 Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 06:35:21 +0000
Subject: [PATCH 053/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4149
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/lemonpen/conf/info.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/lemonpen/conf/info.xml b/addons/lemonpen/conf/info.xml
index 2c68f7de2..25a0cbf52 100644
--- a/addons/lemonpen/conf/info.xml
+++ b/addons/lemonpen/conf/info.xml
@@ -3,6 +3,7 @@
     <title xml:lang="ko">LemonPen XE 애드온</title>
     <title xml:lang="zh-CN">LemonPen XE插件</title>
 	<title xml:lang="en">LemonPen XE Addon</title>
+	<title xml:lang="ge">LemonPen XE Addon</title>
 	<title xml:lang="es">LemonPen XE addon</title>
 	<title xml:lang="ru">LemonPen XE Addon</title>
     <title xml:lang="jp">LemonPen XE アドオン</title>
@@ -10,11 +11,13 @@
         <name xml:lang="ko">zero</name>
         <name xml:lang="zh-CN">zero</name>
 		<name xml:lang="en">zero</name>
+		<name xml:lang="ge">zero</name>
 		<name xml:lang="es">zero</name>
 		<name xml:lang="ru">zero</name>
         <name xml:lang="jp">zero</name>
         <description xml:lang="ko">활성화 하시면 레몬펜을 사이트에 달 수 있습니다.</description>
         <description xml:lang="zh-CN">要想在网站使用LemonPen插件，请将此插件激活。</description>
+		<description xml:lang="ge">Sie können LemonPen auf der Website, wenn Sie diese aktivieren.</description>
 		<description xml:lang="en">You can insert LemonPen to the site when you enable this.</description>
 		<description xml:lang="es">Puede insertar LemonPen al sitio cuando este se activa.</description>
 		<description xml:lang="ru">Вы можете вставить LemonPen к месту, когда вы позволили это.</description>
@@ -25,12 +28,14 @@
             <title xml:lang="ko">sid</title>
             <title xml:lang="zh-CN">sid</title>
 			<title xml:lang="en">sid</title>
+			<title xml:lang="ge">sid</title>
 			<title xml:lang="es">sid</title>
 			<title xml:lang="ru">sid</title>
             <title xml:lang="jp">sid</title>
 			<description xml:lang="ko">레몬펜에서 사이트 등록시 발급받은 sid값을 입력해주세요.</description>
 			<description xml:lang="zh-CN">请输入注册LemonPen网站时，发放的sid值。</description>
 			<description xml:lang="en">Please input sid value that you got after registering at the LemonPen website.</description>
+			<description xml:lang="ge">Bitte geben Sie Ihre SID-Wert ein, die Sie nach Registrierung auf der Website LemonPen.</description>
 			<description xml:lang="es">Por favor, de entrada sid valor que había que hacer después de registrarse en el sitio web LemonPen.</description>
 			<description xml:lang="ru">Введите замороженный ценности, которые вы получили после регистрации на сайте LemonPen.</description>
 			<description xml:lang="jp">レモンペンのサイトで発行されたsidを入力してください。 (LemonPen：Openmaru社提供)</description>

From e3b3f3bc456384b4e7d1128449ac35b777c22f8a Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 06:37:15 +0000
Subject: [PATCH 054/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4150
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/member_extra_info/conf/info.xml    | 12 ++++++++++++
 addons/member_extra_info/lang/ge.lang.php |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 addons/member_extra_info/lang/ge.lang.php

diff --git a/addons/member_extra_info/conf/info.xml b/addons/member_extra_info/conf/info.xml
index 49621abde..2849119a0 100644
--- a/addons/member_extra_info/conf/info.xml
+++ b/addons/member_extra_info/conf/info.xml
@@ -4,6 +4,7 @@
   <title xml:lang="jp">会員情報・コミュニティアドオン</title>
   <title xml:lang="zh-CN">用户扩展信息</title>
   <title xml:lang="en">Activation of Member's Additional Information and Communication Function.</title>
+  <title xml:lang="ge">Die Aktivierung der Mitglied's weitere Informations-und Kommunikations-Funktion.</title>
   <title xml:lang="es">Addon para activar la función de la Información addcional del usuario y  de la comunicación.</title>
   <title xml:lang="ru">Аддон для предоставления дополнительной информации о пользователях и коммуникации</title>
   <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
@@ -11,6 +12,7 @@
     <name xml:lang="jp">Zero</name>
     <name xml:lang="zh-CN">zero</name>
     <name xml:lang="en">zero</name>
+	<name xml:lang="ge">zero</name>
     <name xml:lang="es">zero</name>
     <name xml:lang="ru">zero</name>
     <description xml:lang="ko">
@@ -52,6 +54,16 @@
         3. When a new msessage is arrived, this will display the message in the popup window.
         4. This makes available to send a message if the target is a member when MemberModel::getMemberMenu is called.
         5. This adds a menu for registering as a friend when MemberModel::getMemberMenu is called.
+    </description>
+	<description xml:lang="ge">
+		Unter anderem Informationen über Benutzer, dieses Addon zeigt Bild Name, Bild-Marke, und Unterschrift.
+Dieses Addon ist normalerweise ausgeschaltet zu verringern Ladezeit.
+So zeigen Sie Image-Namen-, Bild-Marke, und die Unterschrift, wenden Sie sich bitte in diesem Addon.
+         1. Recht vor Anzeigen, dieses Addon wird sich für den eindeutigen Schlüssel des Mitglieds aus &lt; div class = "member_ (eindeutigen Schlüssel zu den Mitgliedern)" &gt; ....& lt; / div &gt; und ersetzen wird der Inhalt mit den Image-Namen und / oder Bild-Marke, wenn sie vorhanden sind.
+         2. Recht vor Anzeigen, dieses Addon wird nach &lt; div class = "document_ (eindeutigen Schlüssel des Dokuments)" ... &gt; &lt; / div &gt; und die Anzeige der Signatur in der unteren der Artikel.
+         3. Wenn eine neue msessage ist angekommen, dieser wird die Nachricht in einem Popup-Fenster.
+         4. Dies stellt eine Nachricht zu senden, wenn das Ziel ist Mitglied bei MemberModel:: getMemberMenu aufgerufen.
+         5. Dadurch wird ein Menü für die Eintragung als Freund, wenn MemberModel:: getMemberMenu aufgerufen.
     </description>
     <description xml:lang="es">
         Addon que permite mostrar en la pantalla las informaciones del usuario, la imagen del nombre, Imagen de marca y la firma .
diff --git a/addons/member_extra_info/lang/ge.lang.php b/addons/member_extra_info/lang/ge.lang.php
new file mode 100644
index 000000000..d9b9dcb81
--- /dev/null
+++ b/addons/member_extra_info/lang/ge.lang.php
@@ -0,0 +1,3 @@
+<?php
+    $lang->alert_new_message_arrived = 'Sie haben eine neue Nachricht. Wollen Sie jetzt prüfen, ob?';
+?>

From 570c71b633d2031fa6c692c4504c9b77e8fc580f Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 06:40:10 +0000
Subject: [PATCH 055/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4151
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/openid_delegation_id/conf/info.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/openid_delegation_id/conf/info.xml b/addons/openid_delegation_id/conf/info.xml
index 9b4a86c30..121a9cb3c 100644
--- a/addons/openid_delegation_id/conf/info.xml
+++ b/addons/openid_delegation_id/conf/info.xml
@@ -3,6 +3,7 @@
     <title xml:lang="ko">OpenID delegation ID</title>
     <title xml:lang="zh-CN">OpenID</title>
     <title xml:lang="en">OpenID Delegation ID</title>
+	<title xml:lang="ge">OpenID Delegation ID</title>
     <title xml:lang="es">Delegación ID para OpenID</title>
     <title xml:lang="jp">OpenIDアドオン</title>
     <title xml:lang="ru">Аддон для делигирования доменного имени к OpenID</title>
@@ -10,6 +11,7 @@
         <name xml:lang="ko">제로</name>
         <name xml:lang="zh-CN">zero</name>
         <name xml:lang="en">zero</name>
+		<name xml:lang="ge">zero</name>
         <name xml:lang="es">zero</name>
         <name xml:lang="jp">Zero</name>
         <name xml:lang="ru">Zero</name>
@@ -24,6 +26,10 @@
         <description xml:lang="en">
             This addon enables you to use your own domain name as an OpenID.
             Just be sure to set the values related with openid provider before using.
+        </description>
+		<description xml:lang="ge">
+            Dieses Addon ermöglicht es Ihnen, mit Ihrem eigenen Domain-Namen als OpenID.
+            Einfach sicher sein, dass die Werte im Zusammenhang mit OpenID-Provider, bevor Sie.
         </description>
         <description xml:lang="es">
             Utlizando su propio dominio puede usar como OpenID. 
@@ -43,12 +49,14 @@
             <title xml:lang="ko">server</title>
             <title xml:lang="zh-CN">server</title>
             <title xml:lang="en">server</title>
+			<title xml:lang="ge">server</title>
             <title xml:lang="es">Servidor</title>
             <title xml:lang="jp">server</title>
             <title xml:lang="ru">server</title>
             <description xml:lang="ko">openid.server 값을 입력해 주세요.</description>
             <description xml:lang="zh-CN">请输入 openid.server 值。</description>
             <description xml:lang="en">Please input your openid.server value.</description>
+			<description xml:lang="ge">Bitte geben Sie Ihre openid.server Wert.</description>
             <description xml:lang="es">Ingrese el valor del openid.server.</description>
             <description xml:lang="jp">openid.server の値を入力してください。</description>
             <description xml:lang="ru">Пожалуйста, введите Ваше значение openid сервера.</description>
@@ -56,6 +64,7 @@
         <var name="delegate">
             <title xml:lang="ko">delegate</title>
             <title xml:lang="en">delegate</title>
+			<title xml:lang="ge">delegate</title>
             <title xml:lang="zh-CN">delegate</title>
             <title xml:lang="es">delegado</title>
             <title xml:lang="jp">delegate</title>
@@ -63,6 +72,7 @@
             <description xml:lang="ko">openid.delegate값을 입력해주세요.</description>
             <description xml:lang="zh-CN">请输入 openid.delegate 值。</description>
             <description xml:lang="en">Please input your openid.delegate value.</description>
+			<description xml:lang="ge">Bitte geben Sie Ihre openid.delegate Wert.</description>
             <description xml:lang="es">Ingresar el valor del openid.delegate</description>
             <description xml:lang="jp">openid.delegate の値を入力してください。</description>
             <description xml:lang="ru">Пожалуйста, введите Ваше значение openid делегата.</description>
@@ -71,12 +81,14 @@
             <title xml:lang="ko">xrds</title>
             <title xml:lang="zh-CN">xrds</title>
             <title xml:lang="en">xrds</title>
+			<title xml:lang="ge">xrds</title>
             <title xml:lang="es">xrds</title>
             <title xml:lang="jp">xrds</title>
             <title xml:lang="ru">xrds</title>
             <description xml:lang="ko">X-XRDS-Location값을 입력해주세요.</description>
             <description xml:lang="zh-CN">请输入 X-XRDS-Location 值。</description>
             <description xml:lang="en">Please input your X-XRDS-Location value.</description>
+			<description xml:lang="ge">Bitte geben Sie Ihre X-XRDS-Standort Wert.</description>
             <description xml:lang="es">Ingresar el valor de X-XRDS-Location</description>
             <description xml:lang="jp">X-XRDS-Location の値を入力してください。</description>
             <description xml:lang="ru">Пожалуйста, введите Ваше значение X-XRDS-Локации.</description>

From c6815f9a1a449358da09a1c23bd8f9542167eb8c Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 09:07:42 +0000
Subject: [PATCH 056/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4152
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/autolink/lang/es.lang.php      |  9 +++++++++
 addons/autolink/lang/ge.lang.php      |  9 +++++++++
 addons/autolink/lang/ru.lang.php      |  9 +++++++++
 addons/point_level_icon/conf/info.xml |  6 ++++++
 addons/rainbow_link/conf/info.xml     |  6 ++++++
 addons/referer/conf/info.xml          |  5 +++++
 addons/resize_image/conf/info.xml     | 18 ++++++++++++++++++
 7 files changed, 62 insertions(+)
 create mode 100644 addons/autolink/lang/es.lang.php
 create mode 100644 addons/autolink/lang/ge.lang.php
 create mode 100644 addons/autolink/lang/ru.lang.php

diff --git a/addons/autolink/lang/es.lang.php b/addons/autolink/lang/es.lang.php
new file mode 100644
index 000000000..8ede9189e
--- /dev/null
+++ b/addons/autolink/lang/es.lang.php
@@ -0,0 +1,9 @@
+<?php
+    /**
+     * @file   addons/autolink/lang/ko.lang.php
+     * @author zero (zero@zeroboard.com)
+     * @brief  한국어 언어팩 (기본적인 내용만 수록)
+     **/
+    $lang->open_cur_window = "현재창";
+    $lang->open_new_window = "새창";
+?>
diff --git a/addons/autolink/lang/ge.lang.php b/addons/autolink/lang/ge.lang.php
new file mode 100644
index 000000000..8ede9189e
--- /dev/null
+++ b/addons/autolink/lang/ge.lang.php
@@ -0,0 +1,9 @@
+<?php
+    /**
+     * @file   addons/autolink/lang/ko.lang.php
+     * @author zero (zero@zeroboard.com)
+     * @brief  한국어 언어팩 (기본적인 내용만 수록)
+     **/
+    $lang->open_cur_window = "현재창";
+    $lang->open_new_window = "새창";
+?>
diff --git a/addons/autolink/lang/ru.lang.php b/addons/autolink/lang/ru.lang.php
new file mode 100644
index 000000000..8ede9189e
--- /dev/null
+++ b/addons/autolink/lang/ru.lang.php
@@ -0,0 +1,9 @@
+<?php
+    /**
+     * @file   addons/autolink/lang/ko.lang.php
+     * @author zero (zero@zeroboard.com)
+     * @brief  한국어 언어팩 (기본적인 내용만 수록)
+     **/
+    $lang->open_cur_window = "현재창";
+    $lang->open_new_window = "새창";
+?>
diff --git a/addons/point_level_icon/conf/info.xml b/addons/point_level_icon/conf/info.xml
index 2aa485189..4ad8d6c69 100644
--- a/addons/point_level_icon/conf/info.xml
+++ b/addons/point_level_icon/conf/info.xml
@@ -4,6 +4,7 @@
   <title xml:lang="zh-CN">积分级别图标</title>
   <title xml:lang="jp">ポイントレベルアイコン表示アドオン</title>
   <title xml:lang="en">Point Level Icon</title>
+  <title xml:lang="ge">Point-Level-Symbol</title>
   <title xml:lang="es">Addon para mostar el nivel del ícono</title>
   <title xml:lang="ru">Аддон для отображения иконки уровня</title>
   <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 7. 26">
@@ -11,6 +12,7 @@
     <name xml:lang="zh-CN">Zero</name>
     <name xml:lang="jp">Zero</name>
     <name xml:lang="en">zero</name>
+	<name xml:lang="ge">zero</name>
 	<name xml:lang="es">zero</name>
 	<name xml:lang="ru">zero</name>
     <description xml:lang="ko">
@@ -28,6 +30,10 @@
     <description xml:lang="en">
         This addon displays level icon in front of the user name when you are using the point system.
         You can choose the level icon on Module &gt; Point System.
+    </description>
+	<description xml:lang="ge">
+        Dieses Addon zeigt Level Icon vor dem Benutzernamen, wenn Sie die Punkte-System.
+        Sie können wählen, der Level Icon in Modul> Point-System.
     </description>
 	<description xml:lang="es">
         Este addon muestra el nivel del ícono delante del nombre del usuario cuando es usado el sistema de puntos.
diff --git a/addons/rainbow_link/conf/info.xml b/addons/rainbow_link/conf/info.xml
index 88e79ccfc..2799eab50 100644
--- a/addons/rainbow_link/conf/info.xml
+++ b/addons/rainbow_link/conf/info.xml
@@ -3,6 +3,7 @@
   <title xml:lang="ko">레인보우 링크 애드온</title>
   <title xml:lang="zh-CN">Rainbow链接</title>
   <title xml:lang="en">Rainbow Link Addon</title>
+  <title xml:lang="ge">Rainbow Link Addon</title>
   <title xml:lang="es">Adición Enlace Arco Iris</title>
   <title xml:lang="jp">レインボーリンクアドオン</title>
   <title xml:lang="ru">Аддон для радужных ссылок</title>
@@ -10,6 +11,7 @@
     <name xml:lang="ko">dynamicdrive.com</name>
     <name xml:lang="zh-CN">dynamicdrive.com</name>
     <name xml:lang="en">dynamicdrive.com</name>
+	<name xml:lang="ge">dynamicdrive.com</name>
     <name xml:lang="es">dynamicdrive.com</name>
     <name xml:lang="jp">dynamicdrive.com</name>
 	<name xml:lang="ru">dynamicdrive.com</name>
@@ -24,6 +26,10 @@
     <description xml:lang="en">
         This addon will insert the &quot;rainbow.js&quot; file to the header, which will make the linked text to get the chameleon(rainbow) color change effect.
         &quot;rainbow.js&quot; Copyrightⓒ2007 &lt;a href=&quot;http://www.dynamicdrive.com&quot; target=&quot;_blank&quot;&gt;Dynamicdrive.com&lt;/a&gt;.
+    </description>
+	<description xml:lang="ge">
+        Dieses Addon wird ersetzt durch die "rainbow.js"-Datei auf den Kopf, wodurch der verlinkten Text, um das Chamäleon (Regenbogen) Farbwechsel-Effekt.
+         "rainbow.js" Copyright ⓒ 2007 <a href="http://www.dynamicdrive.com" target="_blank"> Dynamicdrive.com </ a>.
     </description>
     <description xml:lang="es">
         incluye rainbow.js en header para mostrar enlaces en colores de arco iris.
diff --git a/addons/referer/conf/info.xml b/addons/referer/conf/info.xml
index 4940718b0..2823ecfbe 100644
--- a/addons/referer/conf/info.xml
+++ b/addons/referer/conf/info.xml
@@ -4,6 +4,7 @@
   <title xml:lang="jp">リファラー コレクター</title>
   <title xml:lang="zh-CN">反向链接统计</title>
   <title xml:lang="en">Referer Collector</title>
+  <title xml:lang="ge">Referer Collector</title>
   <title xml:lang="es">Referer Collector</title>
   <title xml:lang="ru">Сборщик рефералов</title>
   <author email_address="haneul0318@gmail.com" link="http://haneul.zetyx.net" date="2007. 11. 26">
@@ -11,6 +12,7 @@
     <name xml:lang="jp">Haneul</name>
     <name xml:lang="zn-CN">haneul</name>
     <name xml:lang="en">haneul</name>
+	<name xml:lang="ge">haneul</name>
 	<name xml:lang="es">haneul</name>
     <name xml:lang="ru">haneul</name>
     <description xml:lang="ko">
@@ -24,6 +26,9 @@
     </description>
     <description xml:lang="en">
 	Collect referer log and statistics.
+    </description>
+	<description xml:lang="ge">
+	Collect referer log and statistics.
     </description>
 	<description xml:lang="es">
 	Recoger referer log y estadísticas.
diff --git a/addons/resize_image/conf/info.xml b/addons/resize_image/conf/info.xml
index 5b1c7a1f2..5c471b2f3 100644
--- a/addons/resize_image/conf/info.xml
+++ b/addons/resize_image/conf/info.xml
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <addon version="0.1">
   <title xml:lang="ko">본문내 이미지 조절 애드온</title>
+  <title xml:lang="es">Imagen de control add-on bonmunnae</title>
+  <title xml:lang="ru">Image контроля добавить-на bonmunnae</title>
+  <title xml:lang="ge">Image-Add-on bonmunnae</title>
   <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 22">
     <name xml:lang="ko">zero</name>
+	<name xml:lang="es">zero</name>
+	<name xml:lang="ge">zero</name>
+	<name xml:lang="ru">zero</name>
+	<name xml:lang="en">zero</name>
+	<name xml:lang="zh_cn">zero</name>
+	<name xml:lang="jp">zero</name>
     <description xml:lang="ko">
         본문내에 삽입된 이미지의 크기를 본문크기에 맞게 하고 클릭시 원본을 보여주는 애드온입니다.
+    </description>
+	    <description xml:lang="es">
+        La imagen corporal se inserta dentro del cuerpo para que se adapte al tamaño de la muestra original cuando hago clic en los add-ons.
+    </description>
+	    <description xml:lang="ru">
+        Орган изображение вставляется внутрь тела с учетом размера первоначального шоу, когда я нажимаю на надстройки.
+    </description>
+	    <description xml:lang="ge">
+        Body Bild eingefügt im Inneren des Körpers zu passen die Größe des Originals zeigen, wenn ich darauf klicke auf das Add-ons.
     </description>
   </author>
 </addon>

From 93a6bd053cb58b00b508c7e7492f69fe625460bf Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 27 Apr 2008 15:38:42 +0000
Subject: [PATCH 057/111] =?UTF-8?q?qmail=EB=93=B1=20=EB=B9=84=ED=91=9C?=
 =?UTF-8?q?=EC=A4=80=20=EA=B0=9C=ED=96=89=EB=AC=B8=EC=9E=90=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=20mta=EB=A5=BC=20=EC=A7=80=EC=9B=90=ED=95=98=EA=B8=B0?=
 =?UTF-8?q?=20=EC=9C=84=ED=95=9C=20qmail=5Fcompatibility=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=EB=A5=BC=20db.config.php=EC=97=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=ED=95=98=EA=B3=A0=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=ED=86=A0=EB=A1=9D=20=ED=95=A8?=
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@4153 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php            | 13 +++++----
 classes/mail/Mail.class.php                  | 26 ++++++++++--------
 modules/admin/admin.admin.view.php           |  7 +++--
 modules/admin/tpl/index.html                 | 29 ++++++++++++--------
 modules/install/install.admin.controller.php | 10 +++++--
 modules/install/lang/ko.lang.php             |  4 ++-
 6 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 241cb7b27..de6481a23 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -178,13 +178,16 @@
             $db_config_file = $this->getConfigFile();
             if(file_exists($db_config_file)) @include($db_config_file);
 
-            if(!$db_info->time_zone) $db_info->time_zone = date("O");
-            if(!$db_info->use_optimizer || $db_info->use_optimizer != 'N') $db_info->use_optimizer = 'Y';
-            else $db_info->use_optimizer = 'N';
+            if(!$db_info->time_zone) $db_info->time_zone = date("O");
+            if(!$db_info->use_optimizer || $db_info->use_optimizer != 'N') $db_info->use_optimizer = 'Y';
+            else $db_info->use_optimizer = 'N';
+            if(!$db_info->qmail_compatibility || $db_info->qmail_compatibility != 'Y') $db_info->qmail_compatibility = 'N';
+            else $db_info->qmail_compatibility = 'Y';
 
             $this->_setDBInfo($db_info);
-            
-            $GLOBALS['_time_zone'] = $db_info->time_zone;
+            
+            $GLOBALS['_time_zone'] = $db_info->time_zone;
+            $GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
         }
 
         /**
diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php
index 3fbf9c17e..5e6445166 100644
--- a/classes/mail/Mail.class.php
+++ b/classes/mail/Mail.class.php
@@ -61,27 +61,29 @@
         }
 
         function send() {
-            $boundary = '----=='.uniqid(rand(),true);
+            $boundary = '----=='.uniqid(rand(),true);
+            
+            $eol = $GLOBALS['_qmail_compatibility'] == "Y" ? "\n" : "\r\n";
 
             $headers = sprintf(
-                "From: %s\r\n".
-                "MIME-Version: 1.0\r\n".
-                "Content-Type: multipart/alternative;\r\n\tboundary=\"%s\"\r\n\r\n".
+                "From: %s".$eol.
+                "MIME-Version: 1.0".$eol.
+                "Content-Type: multipart/alternative;".$eol."\tboundary=\"%s\"".$eol.$eol.
                 "",
                 $this->getSender(),
                 $boundary
             );
 
             $body = sprintf(
-                "--%s\r\n".
-                "Content-Type: text/plain; charset=utf-8; format=flowed\r\n".
-                "Content-Transfer-Encoding: base64\r\n".
-                "Content-Disposition: inline\r\n\r\n".
+                "--%s".$eol.
+                "Content-Type: text/plain; charset=utf-8; format=flowed".$eol.
+                "Content-Transfer-Encoding: base64".$eol.
+                "Content-Disposition: inline".$eol.$eol.
                 "%s".
-                "--%s\r\n".
-                "Content-Type: text/html; charset=utf-8\r\n".
-                "Content-Transfer-Encoding: base64\r\n".
-                "Content-Disposition: inline\r\n\r\n".
+                "--%s".$eol.
+                "Content-Type: text/html; charset=utf-8".$eol.
+                "Content-Transfer-Encoding: base64".$eol.
+                "Content-Disposition: inline".$eol.$eol.
                 "%s".
                 "--%s--".
                 "",
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index bdb1b0f21..eda2b0a47 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -34,11 +34,12 @@
             Context::set('running_module', $running_module);
 
             $db_info = Context::getDBInfo();
-
-            Context::set('time_zone_list', $GLOBALS['time_zone']);
-            Context::set('time_zone', $GLOBALS['_time_zone']);
+
+            Context::set('time_zone_list', $GLOBALS['time_zone']);
+            Context::set('time_zone', $GLOBALS['_time_zone']);
             Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N');
             Context::set('use_optimizer', $db_info->use_optimizer!='N'?'Y':'N');
+            Context::set('qmail_compatibility', $db_info->qmail_compatibility=='Y'?'Y':'N');
 
             Context::setBrowserTitle("ZeroboardXE Admin Page");
         }
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index 619a3c315..f74e7b6f2 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -63,17 +63,24 @@
         </select>
         <p>{$lang->about_lang_env}</p>
     </td>
-</tr>
-<tr>
-    <th scope="row">{$lang->time_zone}</th>
-    <td>
-        <select name="time_zone" class="time_zone">
-            <!--@foreach($time_zone_list as $key => $val)-->
-            <option value="{$key}" <!--@if($time_zone==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <p>{$lang->about_time_zone}</p>
-    </td>
+</tr>
+<tr>
+    <th scope="row">{$lang->time_zone}</th>
+    <td>
+        <select name="time_zone" class="time_zone">
+            <!--@foreach($time_zone_list as $key => $val)-->
+            <option value="{$key}" <!--@if($time_zone==$key)-->selected="selected"<!--@end-->>{$val}</option>
+            <!--@end-->
+        </select>
+        <p>{$lang->about_time_zone}</p>
+    </td>
+</tr>
+<tr>
+    <th scope="row">{$lang->qmail_compatibility}</th>
+    <td>
+        <input type="checkbox" name="qmail_compatibility" value="Y"  <!--@if($qmail_compatibility=='Y')-->checked="checked"<!--@end--> />
+        <p>{$lang->about_qmail_compatibility}</p>
+    </td>
 </tr>
 <tr>
     <th colspan="2" class="button">
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 3e72d09df..8ad6bd6cf 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -51,10 +51,14 @@
             $use_optimizer = Context::get('use_optimizer');
             if($use_optimizer!='Y') $use_optimizer = 'N';
 
-            $time_zone = Context::get('time_zone');
+            $time_zone = Context::get('time_zone');
+            
+            $qmail_compatibility = Context::get('qmail_compatibility');
+            if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
 
-            $db_info = Context::getDBInfo();
-            $db_info->time_zone = $time_zone;
+            $db_info = Context::getDBInfo();
+            $db_info->time_zone = $time_zone;
+            $db_info->qmail_compatibility = $qmail_compatibility;
             $db_info->use_rewrite = $use_rewrite;
             $db_info->use_optimizer = $use_optimizer;
             $db_info->lang_type = Context::getLangType();
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
index 3daae9dd4..aac09211c 100644
--- a/modules/install/lang/ko.lang.php
+++ b/modules/install/lang/ko.lang.php
@@ -260,7 +260,9 @@ EndOfLicense;
     $lang->use_rewrite = 'rewrite mod 사용';
     $lang->about_rewrite = '웹서버에서 rewrite mod를 지원하면 http://주소/?document_srl=123 같이 복잡한 주소를 http://주소/123과 같이 간단하게 줄일 수 있습니다.';
     $lang->time_zone = 'time zone';
-    $lang->about_time_zone = '서버의 설정시간과 사용하려는 장소의 시간이 차이가 날 경우 time zone을 지정하시면 표시되는 시간을 지정된 곳의 시간으로 사용하실 수 있습니다';
+    $lang->about_time_zone = '서버의 설정시간과 사용하려는 장소의 시간이 차이가 날 경우 time zone을 지정하시면 표시되는 시간을 지정된 곳의 시간으로 사용하실 수 있습니다';
+    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 하셔야 합니다<br/><span style="color:red">데이터 파일은 707퍼미션 설정된 곳으로 지정해주세요.</span>';
 

From 142f042ee7838f3756be637265260f0f3c4f65fa Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 28 Apr 2008 04:57:58 +0000
Subject: [PATCH 058/111] =?UTF-8?q?=EC=95=A0=EB=93=9C=EC=98=A8=EC=9D=98=20?=
 =?UTF-8?q?info.xml=EC=97=90=EC=84=9C=20html=20charset=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20xml=20parsing=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
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@4154 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/member_extra_info/conf/info.xml | 2 +-
 addons/rainbow_link/conf/info.xml      | 4 ++--
 addons/referer/conf/info.xml           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/member_extra_info/conf/info.xml b/addons/member_extra_info/conf/info.xml
index 2849119a0..6a41019fc 100644
--- a/addons/member_extra_info/conf/info.xml
+++ b/addons/member_extra_info/conf/info.xml
@@ -59,7 +59,7 @@
 		Unter anderem Informationen über Benutzer, dieses Addon zeigt Bild Name, Bild-Marke, und Unterschrift.
 Dieses Addon ist normalerweise ausgeschaltet zu verringern Ladezeit.
 So zeigen Sie Image-Namen-, Bild-Marke, und die Unterschrift, wenden Sie sich bitte in diesem Addon.
-         1. Recht vor Anzeigen, dieses Addon wird sich für den eindeutigen Schlüssel des Mitglieds aus &lt; div class = "member_ (eindeutigen Schlüssel zu den Mitgliedern)" &gt; ....& lt; / div &gt; und ersetzen wird der Inhalt mit den Image-Namen und / oder Bild-Marke, wenn sie vorhanden sind.
+         1. Recht vor Anzeigen, dieses Addon wird sich für den eindeutigen Schlüssel des Mitglieds aus &lt; div class = "member_ (eindeutigen Schlüssel zu den Mitgliedern)" &gt; ....&lt; / div &gt; und ersetzen wird der Inhalt mit den Image-Namen und / oder Bild-Marke, wenn sie vorhanden sind.
          2. Recht vor Anzeigen, dieses Addon wird nach &lt; div class = "document_ (eindeutigen Schlüssel des Dokuments)" ... &gt; &lt; / div &gt; und die Anzeige der Signatur in der unteren der Artikel.
          3. Wenn eine neue msessage ist angekommen, dieser wird die Nachricht in einem Popup-Fenster.
          4. Dies stellt eine Nachricht zu senden, wenn das Ziel ist Mitglied bei MemberModel:: getMemberMenu aufgerufen.
diff --git a/addons/rainbow_link/conf/info.xml b/addons/rainbow_link/conf/info.xml
index 2799eab50..5f16a09cc 100644
--- a/addons/rainbow_link/conf/info.xml
+++ b/addons/rainbow_link/conf/info.xml
@@ -28,8 +28,8 @@
         &quot;rainbow.js&quot; Copyrightⓒ2007 &lt;a href=&quot;http://www.dynamicdrive.com&quot; target=&quot;_blank&quot;&gt;Dynamicdrive.com&lt;/a&gt;.
     </description>
 	<description xml:lang="ge">
-        Dieses Addon wird ersetzt durch die "rainbow.js"-Datei auf den Kopf, wodurch der verlinkten Text, um das Chamäleon (Regenbogen) Farbwechsel-Effekt.
-         "rainbow.js" Copyright ⓒ 2007 <a href="http://www.dynamicdrive.com" target="_blank"> Dynamicdrive.com </ a>.
+        Dieses Addon wird ersetzt durch die &quot;rainbow.js&quot;-Datei auf den Kopf, wodurch der verlinkten Text, um das Chamäleon (Regenbogen) Farbwechsel-Effekt.
+        &quot;rainbow.js&quot; Copyright ⓒ 2007 &lt;a href=&quot;http://www.dynamicdrive.com&quot; target=&quot;_blank&quot;&gt; Dynamicdrive.com &lt;/a&gt;.
     </description>
     <description xml:lang="es">
         incluye rainbow.js en header para mostrar enlaces en colores de arco iris.
diff --git a/addons/referer/conf/info.xml b/addons/referer/conf/info.xml
index 2823ecfbe..c1c540a40 100644
--- a/addons/referer/conf/info.xml
+++ b/addons/referer/conf/info.xml
@@ -28,7 +28,7 @@
 	Collect referer log and statistics.
     </description>
 	<description xml:lang="ge">
-	Collect referer log and statistics.
+    Sammeln Sie Referer-Log und Statistik.
     </description>
 	<description xml:lang="es">
 	Recoger referer log y estadísticas.

From 97eddc0cc824fbd4f5253338ec6a748f84abb3ca Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 28 Apr 2008 05:48:15 +0000
Subject: [PATCH 059/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4155
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/mail/Mail.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php
index 5e6445166..f9f2898b6 100644
--- a/classes/mail/Mail.class.php
+++ b/classes/mail/Mail.class.php
@@ -61,8 +61,7 @@
         }
 
         function send() {
-            $boundary = '----=='.uniqid(rand(),true);
-            
+            $boundary = '----=='.uniqid(rand(),true);
             $eol = $GLOBALS['_qmail_compatibility'] == "Y" ? "\n" : "\r\n";
 
             $headers = sprintf(

From be7aceb7a726f28b6f20ab58654f572f5f4cc3ed Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 28 Apr 2008 06:12:19 +0000
Subject: [PATCH 060/111] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20item=20cl?=
 =?UTF-8?q?ass=EC=97=90=EC=84=9C=20=EA=B4=80=EB=A0=A8=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=9D=98=20=EC=97=AE=EC=9D=B8=EA=B8=80=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8=EC=8B=9C=20=EC=97=AE=EC=9D=B8=EA=B8=80=20?=
 =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=84=A4=EC=A0=95=EB=B3=80=EC=88=98?=
 =?UTF-8?q?=EC=9D=98=20=EA=B0=92=EC=9D=B4=20null=EC=9D=BC=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20Y=EB=A1=9C=20=EC=84=A4=EC=A0=95=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?=
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@4156 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.item.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 605a8d6df..6fb839cee 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -86,6 +86,7 @@
                 // 엮인글 관리 모듈의 사용금지 설정 상태이면 무조건 금지, 그렇지 않으면 개별 체크
                 $oModuleModel = &getModel('module');
                 $trackback_config = $oModuleModel->getModuleConfig('trackback');
+                if(!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
 
                 if($trackback_config->enable_trackback != 'Y') $this->allow_trackback_status = false; 
                 else {

From 66c292214fc9a9f5177c9ac4f58a28150293406a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 28 Apr 2008 23:47:06 +0000
Subject: [PATCH 061/111] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=B6=84?=
 =?UTF-8?q?=EB=A5=98=EC=9D=98=20=EA=B6=8C=ED=95=9C=20=EC=A7=80=EC=A0=95?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?=
 =?UTF-8?q?=EC=84=A4=EB=AA=85=20=EC=88=98=EC=A0=95?=
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@4157 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/lang/en.lang.php    | 2 +-
 modules/board/lang/es.lang.php    | 2 +-
 modules/board/lang/fr.lang.php    | 2 +-
 modules/board/lang/jp.lang.php    | 2 +-
 modules/board/lang/ko.lang.php    | 2 +-
 modules/board/lang/ru.lang.php    | 2 +-
 modules/board/lang/zh-CN.lang.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/board/lang/en.lang.php b/modules/board/lang/en.lang.php
index 1a72829c7..3e9e0d183 100644
--- a/modules/board/lang/en.lang.php
+++ b/modules/board/lang/en.lang.php
@@ -30,7 +30,7 @@
     // blah blah..
     $lang->about_category_title = 'Please input category name';
     $lang->about_expand = 'By selecting this option, it will be always expanded';
-    $lang->about_category_group_srls = 'Only the selected group will be able to see current categories. (Manually open xml file to expose)';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = 'You can manually modify board layout code. Insert or manage the widget code anywhere you want';
     $lang->about_board_category = 'You can make board categories.<br />When board category is broken, try rebuilding the cache file manually.';
     $lang->about_except_notice = "Notice articles will not be displayed on normal list.";
diff --git a/modules/board/lang/es.lang.php b/modules/board/lang/es.lang.php
index 46e815af1..9fd72ce4c 100644
--- a/modules/board/lang/es.lang.php
+++ b/modules/board/lang/es.lang.php
@@ -32,7 +32,7 @@
     // bla bla...
     $lang->about_category_title = 'Ingresar el nombre de la categoría.';
     $lang->about_expand = 'Si seleccionas esta opción, siempre estará expandido.';
-    $lang->about_category_group_srls = 'Solo se verán los grupos seleccionados en la actual categoría. (Abrir manualmente en archivo xml para la exposición)';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = 'Puede modificar manualmente el código del diseño de tableros. Insertar o modificar el código de widget.';
     $lang->about_board_category = 'Puede crear las categorias de tableros.<br />Cuando no funciona la categoría de tableros, rehacer el archivo caché manualmente para solucionar.';
     $lang->about_except_notice = "Aviso de los artículos no se mostrará en la lista normal.";
diff --git a/modules/board/lang/fr.lang.php b/modules/board/lang/fr.lang.php
index 7b467871c..344c52e93 100644
--- a/modules/board/lang/fr.lang.php
+++ b/modules/board/lang/fr.lang.php
@@ -30,7 +30,7 @@
     // blah blah..
     $lang->about_category_title = 'Entrez le nom de la catégorie, SVP.';
     $lang->about_expand = 'Si vous cochez la case, ce sera toujours tendu';
-    $lang->about_category_group_srls = 'Le groupe sélectionné seulement pourra voir ces catégories. (Ouvrir manuellement le fiche de xml, c\'est l\'exposer)';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = 'Vous pouvez manuellement modifier le code de Mise en Page du Panneau. Insérez ou arrangez le code de Widget n\'importe où vous voulez.';
     $lang->about_board_category = 'Vous pouvez créer des catégories d\'affichage dans le tableau. Quand la catégorie d\'affichage est cassé, essayez manuellement rétablir la cachette du fichier.';
     $lang->about_except_notice = "L'Article de Notice ne sera exposé sur la liste normale.";
diff --git a/modules/board/lang/jp.lang.php b/modules/board/lang/jp.lang.php
index 87bf60a74..8accc7f5a 100644
--- a/modules/board/lang/jp.lang.php
+++ b/modules/board/lang/jp.lang.php
@@ -33,7 +33,7 @@
     // その他
     $lang->about_category_title = 'カテゴリ名を入力して下さい。';
     $lang->about_expand = 'チェックすると常に展開された状態になります。';
-    $lang->about_category_group_srls = '選択したグループのみ現在のカテゴリが見えるようになります（XMLファイルを直接閲覧すると表示されます）。';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = 'ブログのレイアウトのコードを直接修正します。ウィジェットコードを好きなところに入力、又は管理して下さい。';
     $lang->about_board_category = 'ブログのカテゴリを作成します。<br />ブログのカテゴリが誤作動する場合、「キャッシュファイルの再生性」を手動で行うことで解決できます。';
     $lang->about_except_notice = "リストの上段に常に表示されるお知らせの書き込みを一般リストからお知らせの書き込みが表示されないようにします。";
diff --git a/modules/board/lang/ko.lang.php b/modules/board/lang/ko.lang.php
index 697be8542..eb37f0485 100644
--- a/modules/board/lang/ko.lang.php
+++ b/modules/board/lang/ko.lang.php
@@ -30,7 +30,7 @@
     // 주절 주절..
     $lang->about_category_title = '카테고리 이름을 입력해주세요';
     $lang->about_expand = '선택하시면 늘 펼쳐진 상태로 있게 합니다';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리가 보이게 됩니다. (xml파일을 직접 열람하면 노출이 됩니다)';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = '블로그의 레이아웃 코드를 직접 수정할 수 있습니다. 위젯 코드를 원하는 곳에 삽입하시거나 관리하세요';
     $lang->about_board_category = '분류를 만드실 수 있습니다.<br />분류가 오동작을 할 경우 캐시파일 재생성을 수동으로 해주시면 해결이 될 수 있습니다.';
     $lang->about_except_notice = "목록 상단에 늘 나타나는 공지사항을 일반 목록에서 공지사항을 출력하지 않도록 합니다.";
diff --git a/modules/board/lang/ru.lang.php b/modules/board/lang/ru.lang.php
index 9cc8ae4c2..5c13d0677 100644
--- a/modules/board/lang/ru.lang.php
+++ b/modules/board/lang/ru.lang.php
@@ -33,7 +33,7 @@
     // blah blah.. или чушь всякая... ;)
     $lang->about_category_title = 'Пожалуйста, введите название категории';
     $lang->about_expand = 'Если эта опция выбрана, расширение будут применено всегда';
-    $lang->about_category_group_srls = 'Только выбранная группа будет способна видеть ткущие категории. (Вручную откройте xml файл, чтобы сделать видимыми)';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = 'Вы можете вручную изменять лейаут код блога. Вставляйте или управляйте кодом виджетов везде, где хотите';
     $lang->about_board_category = 'Вы можете сделать категории блога.<br />Когда категория блога испорчена, попробуйте перепостроить файл кеша вручную.';
     $lang->about_except_notice = "목록 상단에 늘 나타나는 공지사항을 일반 목록에서 공지사항을 출력하지 않도록 합니다.";
diff --git a/modules/board/lang/zh-CN.lang.php b/modules/board/lang/zh-CN.lang.php
index 181fd866f..09612c92e 100644
--- a/modules/board/lang/zh-CN.lang.php
+++ b/modules/board/lang/zh-CN.lang.php
@@ -34,7 +34,7 @@
     // 信息、提示..
     $lang->about_category_title = '请输入分类名。';
     $lang->about_expand = '选择此项将维持展开状态。';
-    $lang->about_category_group_srls = '被选的用户组才可以查看此分类。';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = '可直接编辑博客布局代码。可以把控件代码插入到您喜欢的位置。';
     $lang->about_board_category = '可以添加/删除分类项<br />分类有异常情况时，可以尝试重新生成缓冲文件。';
     $lang->about_except_notice = "设置公告目录项不再重复显示到普通目录当中。";

From aa0c4957adfadc4a639d6a9f59224b6635a8e7ae Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 29 Apr 2008 01:34:37 +0000
Subject: [PATCH 062/111] =?UTF-8?q?qmail=20=EA=B4=80=EB=A0=A8=20=EC=97=85?=
 =?UTF-8?q?=EB=8E=83(r4153)=EC=97=90=20=EB=B9=A0=EC=A7=84=20=EB=B2=88?=
 =?UTF-8?q?=EC=97=AD=EB=8C=80=EC=83=81=20=EB=82=B4=EC=9A=A9=20=EC=B6=94?=
 =?UTF-8?q?=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@4158 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/en.lang.php    | 2 ++
 modules/install/lang/es.lang.php    | 2 ++
 modules/install/lang/fr.lang.php    | 2 ++
 modules/install/lang/jp.lang.php    | 2 ++
 modules/install/lang/ru.lang.php    | 2 ++
 modules/install/lang/zh-CN.lang.php | 4 +++-
 6 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php
index 97a46d811..595ae3971 100644
--- a/modules/install/lang/en.lang.php
+++ b/modules/install/lang/en.lang.php
@@ -169,6 +169,8 @@ EndOfLicense;
     $lang->about_rewrite = "If web server provides rewrite mod, long URL such as http://blah/?document_srl=123 can be shortened like http://blah/123";
     $lang->time_zone = 'Time zone';
     $lang->about_time_zone = "If the server time and the time on your location don't accord each other, you can set the time as same as your location by using time zone ";
+    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqlite saves data in the file. Location of the database file should be unreachable by web<br/><span style="color:red">Data file should be inside the permission of 707.</span>';
 
diff --git a/modules/install/lang/es.lang.php b/modules/install/lang/es.lang.php
index b7ba77fec..32fa12cf2 100644
--- a/modules/install/lang/es.lang.php
+++ b/modules/install/lang/es.lang.php
@@ -265,6 +265,8 @@ EndOfLicense;
     $lang->about_rewrite = "Si el servidor de la web soporte rewrite mod, URL largas como http://bla/?documento_srl=123 puede abreviarse como  http://bla/123";
     $lang->time_zone = 'La Hora por Zona';
     $lang->about_time_zone = "Si la hora del servidor y la hora de su ubicación es diferente, Usted puede elegir la hora por zona para corregir";
+    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqlite guarda el dato en el archivo. Es necesario crear archivo de BD en un lugar inaccesible de la web.<br/><span style="color:red">El archivo de dato debe estar ubicado en un lugar con la atribución 707.</span>';
 
diff --git a/modules/install/lang/fr.lang.php b/modules/install/lang/fr.lang.php
index 69df79003..45cdefc75 100644
--- a/modules/install/lang/fr.lang.php
+++ b/modules/install/lang/fr.lang.php
@@ -223,6 +223,8 @@ EndOfLicense;
     $lang->about_rewrite = "Si le serveur de web est capable d'utiliser le mode de récrire, URL longue comme http://blah/?document_srl=123 peut être abrégé comme http://blah/123";
     $lang->time_zone = 'Fuseau horaire';
     $lang->about_time_zone = "Si l'heure de serveur et celle de votre emplacement ne s'accordent pas,  vous pouvez remettre l'heure comme le même heure de votre lieu en configurant le fuseau horaire ";
+    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqlite conserve des données dans le fichier. Vous devez placer le fichier de la base de données où l\'on ne peut pas accéder par web.<br/><span style="color:red">Le fichier des Donées doit être en dedans la permission 707.</span>';
 
diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
index 6f2be8c80..a75ee0c58 100644
--- a/modules/install/lang/jp.lang.php
+++ b/modules/install/lang/jp.lang.php
@@ -262,6 +262,8 @@ EndOfLicense;
     $lang->about_rewrite = 'Webサーバで「リライト・モジュール（mod_rewrite）」をサポートしている場合は、「http://アドレス/?document_srl=123」のようなアドレスを「http://アドレス/123」のように動的だけど静的なページに見せることができます。';
     $lang->time_zone = 'タイムゾーン';
     $lang->about_time_zone = 'サーバの設定時間とサービスしているローカル時間との差が生じる場合、タイムゾーンを指定すれば、表示時間を指定したところの時間に設定できます。';
+    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqliteはファイルにデータを保存します。そのため、データベースファイルにはウェブからアクセスできない場所にしなければなりません。<br/><span style="color:red">データファイルのパーミッションは「707」に設定してください。</span>';
 
diff --git a/modules/install/lang/ru.lang.php b/modules/install/lang/ru.lang.php
index 3e7e56391..1fb4695d8 100644
--- a/modules/install/lang/ru.lang.php
+++ b/modules/install/lang/ru.lang.php
@@ -353,6 +353,8 @@ EndOfLicense;
     $lang->about_rewrite = "Если сервер предлагает rewrite mod, длинные URL такие как  http://blah/?document_srl=123 могут быть сокращены до http://blah/123";
     $lang->time_zone = 'Часовой пояс';
     $lang->about_time_zone = "Если серверное время и Ваше локальное время не совпадают, Вы можете установить такое же время, как Ваше локальное, используя часовой пояс";
+    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqlite сохраняет данные в файл. Размещение базы данных должно быть недоступно с веб<br/><span style="color:red">Файл базы данных должен иметь права доступа 707.</span>';
 
diff --git a/modules/install/lang/zh-CN.lang.php b/modules/install/lang/zh-CN.lang.php
index 41bbaf068..a4d4d6300 100644
--- a/modules/install/lang/zh-CN.lang.php
+++ b/modules/install/lang/zh-CN.lang.php
@@ -253,7 +253,9 @@ EndOfLicense;
     $lang->use_rewrite = '使用rewrite模块';
     $lang->about_rewrite = '如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。';
     $lang->time_zone = '时区';
-    $lang->about_time_zone = '服务器时间和您所处的时间有差异时，可以设置时区来满足你所需要的时间显示。';
+    $lang->about_time_zone = '服务器时间和您所处的时间有差异时，可以设置时区来满足你所需要的时间显示。';
+    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqlite是文件里保存数据。数据库的文件位置应该放在web不能访问的地方。<br/><span style="color:red">数据文件应放在具有707属性的位置。</span>';
 

From e6a19417fff32012eb8df4e086cc30bd8a39f8cf Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 29 Apr 2008 02:32:06 +0000
Subject: [PATCH 063/111] =?UTF-8?q?#466=20Context=20class=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=9C=A0=EB=AC=B4=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8=ED=9B=84=20=EB=A7=A4=EB=B2=88=20=EC=84=B8?=
 =?UTF-8?q?=EC=85=98=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EC=83=88=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B0=B1=EC=8B=A0=ED=95=98=EB=8F=84=EB=A1=9D=20=ED=95=98?=
 =?UTF-8?q?=EC=97=AC=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EB=90=9C=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EC=9D=98=20=ED=98=84=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20?=
 =?UTF-8?q?=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EC=9A=B4=EC=98=81=ED=95=A0=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
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@4159 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php    | 29 ++++++++-------
 modules/member/member.controller.php | 54 +++++++++++++---------------
 modules/member/tpl/member_list.html  |  2 +-
 modules/point/point.controller.php   |  7 ----
 4 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index de6481a23..d6e68f614 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -109,24 +109,23 @@
             $this->_setRequestArgument();
             $this->_setUploadedArgument();
 
-            // 인증관련 데이터를 Context에 설정
-            $oMemberModel = &getModel('member');
-
-            // 로그인되어 있지 않고 자동로그인 키값이 있으면 자동 로그인 체크
-            if(Context::isInstalled() && !$oMemberModel->isLogged() && $_COOKIE['xeak']) {
+            // 인증 관련 정보를 Context와 세션에 설정
+            if(Context::isInstalled()) {
+                // 인증관련 데이터를 Context에 설정
+                $oMemberModel = &getModel('member');
                 $oMemberController = &getController('member');
-                $oMemberController->doAutologin();
-            }
 
-            // 로그인되어 있으면 로그인 정보 기록
-            if($oMemberModel->isLogged()) {
-                $this->_set('is_logged', true);
-                $this->_set('logged_info', $_SESSION['logged_info']);
+                // 인증이 되어 있을 경우 유효성 체크
+                if($oMemberModel->isLogged()) {
+                    $oMemberController->setSessionInfo();
 
-            // 로그인 되어 있지 않으면 먼저 자동 로그인을 체크 비로그인 상태 기록
-            } else {
-                $this->_set('is_logged', false);
-                $this->_set('logged_info', NULL);
+                // 인증이 되어 있지 않을 경우 자동 로그인 확인
+                } elseif($_COOKIE['xeak']) {
+                    $oMemberController->doAutologin();
+                }
+
+                $this->_set('is_logged', $oMemberModel->isLogged() );
+                $this->_set('logged_info', $oMemberModel->getLoggedInfo() );
             }
 
             // rewrite 모듈사용 상태 체크
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index c69a2782e..2e8aff7e7 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -775,9 +775,6 @@
             // user_id 에 따른 정보 가져옴
             $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
 
-            // 사용자의 전용 메뉴 구성
-            $member_info->menu_list = $this->getMemberMenuList();
-
             // 로그인 성공후 trigger 호출 (after)
             $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info);
             if(!$trigger_output->toBool()) return $trigger_output;
@@ -1168,8 +1165,7 @@
             if ($output->data->is_register == 'Y') {
                 $args->password = $output->data->new_password;
                 $args->denied = 'N';
-            }
-            else {
+            } else {
                 $args->password = md5($output->data->new_password);
                 unset($args->denied);
             }
@@ -1186,9 +1182,6 @@
             // 회원의 정보를 가져옴
             $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 
-            // 사용자의 전용 메뉴 구성
-            $member_info->menu_list = $this->getMemberMenuList();
-
             // 로그인 성공후 trigger 호출 (after)
             $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info);
             if(!$trigger_output->toBool()) return $trigger_output;
@@ -1309,15 +1302,12 @@
             }
 
             // denied_date가 현 시간보다 적으면 알림
-            if($member_info->limit_date && $member_info->limit_date >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($member_info->limit_date,"Y-m-d")));
+            if($member_info->limit_date && substr($member_info->limit_date,0,8) >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($member_info->limit_date,"Y-m-d")));
 
             // 사용자 정보의 최근 로그인 시간을 기록
             $args->member_srl = $member_info->member_srl;
             $output = executeQuery('member.updateLastLogin', $args);
 
-            // 사용자의 전용 메뉴 구성
-            $member_info->menu_list = $this->getMemberMenuList();
-
             // 로그인 성공후 trigger 호출 (after)
             $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info);
             if(!$trigger_output->toBool()) return $trigger_output;
@@ -1329,9 +1319,7 @@
                 $autologin_args->member_srl = $member_info->member_srl;
                 executeQuery('member.deleteAutologin', $autologin_args);
                 $autologin_output = executeQuery('member.insertAutologin', $autologin_args);
-                if($autologin_output->toBool()) {
-                    setCookie('xeak',$autologin_args->autologin_key, time()+60*60*24*365, '/');
-                }
+                if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, time()+60*60*24*365, '/');
             }
 
             $this->setSessionInfo($member_info);
@@ -1339,24 +1327,30 @@
             return $output;
         }
 
-        /**
-         * @brief 로그인 사용자의 전용 메뉴를 구성
-         **/
-        function getMemberMenuList() {
-            $menu_list['dispMemberInfo'] = 'cmd_view_member_info';
-            $menu_list['dispMemberFriend'] = 'cmd_view_friend';
-            $menu_list['dispMemberMessages'] = 'cmd_view_message_box';
-            $menu_list['dispMemberScrappedDocument'] = 'cmd_view_scrapped_document';
-            $menu_list['dispMemberSavedDocument'] = 'cmd_view_saved_document';
-            $menu_list['dispMemberOwnDocument'] = 'cmd_view_own_document';
-            return $menu_list;
-        }
-
         /**
          * @brief 세션 정보 갱싱 또는 생성
          **/
-        function setSessionInfo($member_info) {
-            if(!$member_info->member_srl) return;
+        function setSessionInfo($member_info = null) {
+            $oMemberModel = &getModel('member');
+
+            // 사용자 정보가 넘어오지 않았다면 현재 세션 정보에서 사용자 정보를 추출
+            if(!$member_info && $_SESSION['member_srl'] && $oMemberModel->isLogged() ) {
+                $member_info = $oMemberModel->getMemberInfoByMemberSrl($_SESSION['member_srl']);
+
+                // 회원정보가 없다면 세션 파기
+                if($member_info->member_srl != $_SESSION['member_srl']) {
+                    $this->destroySessionInfo();
+                    return;
+                }
+            }
+
+            // 사용자의 전용 메뉴 구성 (이 메뉴는 애드온등으로 변경될 수 있음)
+            $member_info->menu_list['dispMemberInfo'] = 'cmd_view_member_info';
+            $member_info->menu_list['dispMemberFriend'] = 'cmd_view_friend';
+            $member_info->menu_list['dispMemberMessages'] = 'cmd_view_message_box';
+            $member_info->menu_list['dispMemberScrappedDocument'] = 'cmd_view_scrapped_document';
+            $member_info->menu_list['dispMemberSavedDocument'] = 'cmd_view_saved_document';
+            $member_info->menu_list['dispMemberOwnDocument'] = 'cmd_view_own_document';
 
             // 오픈아이디인지 체크 (일단 아이디 형식으로만 결정)
             if(preg_match("/^([0-9a-z]+)$/is", $member_info->user_id)) $member_info->is_openid = false;
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 56e34322f..4be6b77f0 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -84,7 +84,7 @@
     </tr>
     <tr>
         <td class="red"><!--@if($val->is_admin != 'Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}">{$lang->cmd_delete}</a><!--@else--><img src="./images/icon_management.gif" title="{$lang->is_admin}" alt="{$lang->is_admin}" /><!--@end--></td>
-        <td colspan="2">{$val->group_list}</td>
+        <td colspan="2">{$val->group_list}&nbsp;</td>
         <td>
             <!--@if($val->homepage)--><a href="{$val->homepage}" class="homepage" onclick="window.open(this.href);return false;"><img src="./images/icon_homepage.gif" title="{$lang->homepage}" alt="{$lang->homepage}" /></a> <!--@end-->
             <!--@if($val->blog)--><a href="{$val->blog}" class="blog" onclick="window.open(this.href);return false;"><img src="./images/icon_blog.gif" title="{$lang->blog}" alt="{$lang->blog}" /></a> <!--@end-->&nbsp;
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index 7acee02d1..b62e50a0f 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -422,13 +422,6 @@
                     $new_group_args->member_srl = $member_srl;
                     $new_group_args->group_srl = $current_group_srl;
                     $new_group_output = executeQuery('member.addMemberToGroup', $new_group_args);
-
-                    // 만약 대상 사용자와 로그인 사용자의 정보가 동일하다면 세션을 변경해줌
-                    $logged_info = Context::get('logged_info');
-                    if($logged_info->member_srl == $member_srl) {
-                        $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-                        $_SESSION['logged_info']->group_list = $member_info->group_list;
-                    }
                 }
             }
 

From 602bbe80e88a63150eb2819e5de467534602e9b4 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 29 Apr 2008 04:46:09 +0000
Subject: [PATCH 064/111] =?UTF-8?q?#464=20=EC=AA=BD=EC=A7=80=20=EC=88=98?=
 =?UTF-8?q?=EC=8B=A0=20=EC=97=AC=EB=B6=80=EB=A5=BC=20=EC=AA=BD=EC=A7=80?=
 =?UTF-8?q?=ED=95=A8=EC=97=90=EC=84=9C=20=EB=B3=B4=EC=9D=B4=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=ED=95=98=EA=B3=A0=20=EC=BB=A4=EB=AE=A4=EB=8B=88?=
 =?UTF-8?q?=EC=BC=80=EC=9D=B4=EC=85=98=20=EC=95=A0=EB=93=9C=EC=98=A8=20?=
 =?UTF-8?q?=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=EC=8B=9C=20=EA=B0=9C?=
 =?UTF-8?q?=EC=9D=B8=EC=9D=98=20=EC=AA=BD=EC=A7=80=ED=95=A8/=EC=B9=9C?=
 =?UTF-8?q?=EA=B5=AC=ED=95=A8=EC=9D=B4=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC?=
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@4160 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../member_extra_info.addon.php               |  6 +++++
 modules/member/conf/module.xml                |  1 +
 modules/member/member.controller.php          | 27 ++++++++++++++-----
 modules/member/queries/updateAllowMessage.xml | 11 ++++++++
 modules/member/queries/updateMember.xml       |  2 +-
 modules/member/skins/default/css/common.css   |  1 +
 .../skins/default/filter/modify_info.xml      |  1 -
 .../default/filter/update_allow_message.xml   |  5 ++++
 .../member/skins/default/member_messages.html | 11 ++++++++
 modules/member/skins/default/modify_info.html | 11 --------
 10 files changed, 57 insertions(+), 19 deletions(-)
 create mode 100644 modules/member/queries/updateAllowMessage.xml
 create mode 100644 modules/member/skins/default/filter/update_allow_message.xml

diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php
index fecf0162d..42dc88cc6 100644
--- a/addons/member_extra_info/member_extra_info.addon.php
+++ b/addons/member_extra_info/member_extra_info.addon.php
@@ -39,6 +39,12 @@
         // 로그인된 사용자 정보를 구함
         $logged_info = Context::get('logged_info');
 
+        // 회원 로그인 정보중에서 쪽지등의 메뉴를 추가
+        $logged_info->menu_list['dispMemberFriend'] = 'cmd_view_friend';
+        $logged_info->menu_list['dispMemberMessages'] = 'cmd_view_message_box';
+        Context::set('logged_info', $logged_info);
+        $_SESSION['logged_info'] = $logged_info;
+
         $flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl);
         $flag_file = sprintf('%s%s', $flag_path, $logged_info->member_srl);
 
diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index 8f7aeac52..3a828bc44 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -54,6 +54,7 @@
         <action name="procMemberDeleteImageName" type="controller" standalone="true" />
         <action name="procMemberDeleteImageMark" type="controller" standalone="true" />
 
+        <action name="procMemberUpdateAllowMessage" type="controller" standalone="true" />
         <action name="procMemberSendMessage" type="controller" standalone="true" />
         <action name="procMemberStoreMessage" type="controller" standalone="true" />
         <action name="procMemberDeleteMessage" type="controller" standalone="true" />
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 2e8aff7e7..7a5ccde5a 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -152,6 +152,23 @@
             return $output;
         }
 
+        /**
+         * @brief 쪽지함 설정 변경
+         **/
+        function procMemberUpdateAllowMessage() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+
+            $args->allow_message = Context::get('allow_message');
+            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+
+            $output = executeQuery('member.updateAllowMessage', $args);
+
+            return $output;
+        }
+
         /**
          * @brief 쪽지 발송
          **/
@@ -696,7 +713,7 @@
             if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
 
             // 필수 정보들을 미리 추출
-            $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','allow_message');
+            $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing');
             $args->member_srl = getNextSequence();
 
             // 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제
@@ -740,7 +757,7 @@
             if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
 
             // 필수 정보들을 미리 추출
-            $args = Context::gets('user_name','nick_name','homepage','blog','birthday','email_address','allow_mailing','allow_message');
+            $args = Context::gets('user_name','nick_name','homepage','blog','birthday','email_address','allow_mailing');
 
             // 로그인 정보
             $logged_info = Context::get('logged_info');
@@ -1346,8 +1363,6 @@
 
             // 사용자의 전용 메뉴 구성 (이 메뉴는 애드온등으로 변경될 수 있음)
             $member_info->menu_list['dispMemberInfo'] = 'cmd_view_member_info';
-            $member_info->menu_list['dispMemberFriend'] = 'cmd_view_friend';
-            $member_info->menu_list['dispMemberMessages'] = 'cmd_view_message_box';
             $member_info->menu_list['dispMemberScrappedDocument'] = 'cmd_view_scrapped_document';
             $member_info->menu_list['dispMemberSavedDocument'] = 'cmd_view_saved_document';
             $member_info->menu_list['dispMemberOwnDocument'] = 'cmd_view_own_document';
@@ -1407,7 +1422,7 @@
             // 필수 변수들의 조절
             if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
             if($args->denied!='Y') $args->denied = 'N';
-            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message= 'Y';
+            $args->allow_message= 'Y';
 
             if($logged_info->is_admin == 'Y') {
                 if($args->is_admin!='Y') $args->is_admin = 'N';
@@ -1543,7 +1558,7 @@
 
             // 필수 변수들의 조절
             if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+            if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
 
             if($logged_info->is_admin == 'Y') {
                 if($args->denied!='Y') $args->denied = 'N';
diff --git a/modules/member/queries/updateAllowMessage.xml b/modules/member/queries/updateAllowMessage.xml
new file mode 100644
index 000000000..f435107da
--- /dev/null
+++ b/modules/member/queries/updateAllowMessage.xml
@@ -0,0 +1,11 @@
+<query id="updateAllowMessage" action="update">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="allow_message" var="allow_message" default="Y" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+    </conditions>
+</query>
diff --git a/modules/member/queries/updateMember.xml b/modules/member/queries/updateMember.xml
index 98e4d26aa..cdd12e5b6 100644
--- a/modules/member/queries/updateMember.xml
+++ b/modules/member/queries/updateMember.xml
@@ -13,7 +13,7 @@
         <column name="blog" var="blog" />
         <column name="birthday" var="birthday" />
         <column name="allow_mailing" var="allow_mailing" default="Y" />
-        <column name="allow_message" var="allow_message" default="Y" />
+        <column name="allow_message" var="allow_message" />
         <column name="denied" var="denied" />
         <column name="limit_date" var="limit_date" />
         <column name="is_admin" var="is_admin" />
diff --git a/modules/member/skins/default/css/common.css b/modules/member/skins/default/css/common.css
index 511cc5c06..d683fe0c1 100644
--- a/modules/member/skins/default/css/common.css
+++ b/modules/member/skins/default/css/common.css
@@ -87,6 +87,7 @@
 .readMessage .messageHeader address .date { font:.8em Tahoma; color:#999999; margin-left:10px;}
 .readMessage .messageBody { border:1px solid #e0e1db; margin:0 1.5em 1.5em 1.5em; padding:1em; color:#666666;}
 .readMessage .deleteOrKeep { padding:.5em 0; overflow:hidden; background:#f5f5f3; border-top:1px solid #eaebe7; _width:100%;}
+.messageSetup { float:left; overflow:hidden; }
 .instantMessage { float:right; overflow:hidden;}
 .instantMessage li { float:left; padding:0 .8em 0 .8em; margin-left:-1px; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left center; list-style:none; }
 .instantMessage li a { text-decoration:none; display:block; float:left; height:1em; height:1.1em; overflow:hidden; font-size:1em; white-space:nowrap; color:#666666; padding-left:1.8em; background:url(../images/common/iconInstantMessage.gif) no-repeat left top;}
diff --git a/modules/member/skins/default/filter/modify_info.xml b/modules/member/skins/default/filter/modify_info.xml
index 5f5fbaef0..7cafb4872 100644
--- a/modules/member/skins/default/filter/modify_info.xml
+++ b/modules/member/skins/default/filter/modify_info.xml
@@ -12,7 +12,6 @@
         <param name="blog" target="blog" />
         <param name="birthday" target="birthday" />
         <param name="allow_mailing" target="allow_mailing" />
-        <param name="allow_message" target="allow_message" />
         <param name="email_address" target="email_address" />
         <param name="signature" target="signature" />
     </parameter>
diff --git a/modules/member/skins/default/filter/update_allow_message.xml b/modules/member/skins/default/filter/update_allow_message.xml
new file mode 100644
index 000000000..c28e9c32d
--- /dev/null
+++ b/modules/member/skins/default/filter/update_allow_message.xml
@@ -0,0 +1,5 @@
+<filter name="update_allow_message" module="member" act="procMemberUpdateAllowMessage">
+    <form />
+    <parameter />
+    <response />
+</filter>
diff --git a/modules/member/skins/default/member_messages.html b/modules/member/skins/default/member_messages.html
index 86651c3e6..2a2093dd6 100644
--- a/modules/member/skins/default/member_messages.html
+++ b/modules/member/skins/default/member_messages.html
@@ -5,6 +5,7 @@
 <!--@end-->
 <!--#include("./common_header.html")-->
 <!--%import("filter/delete_checked_message.xml")-->
+<!--%import("filter/update_allow_message.xml")-->
 
     <!--@if($message)-->
     <div class="readMessage">
@@ -37,6 +38,16 @@
     <!--@end-->
 
 	<div class="boardInformation">
+        <div class="messageSetup">
+            <form action="./" method="POST" onsubmit="return procFilter(this, update_allow_message)">
+                <select name="allow_message">
+                    <!--@foreach($lang->allow_message_type as $key => $val)-->
+                    <option value="{$key}" <!--@if($logged_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
+                    <!--@end-->
+                </select>
+                <span class="button"><input type="submit" value="{$lang->cmd_save}"></span>
+            </form>
+        </div>
         <ul class="instantMessage">
             <!--@foreach($lang->message_box as $key => $val)-->
                 <!--@if($key == $message_type)-->
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 0be83599a..00c71c7fb 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -135,17 +135,6 @@
         <th scope="row">{$lang->allow_mailing}</th>
         <td><input type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p>{$lang->about_allow_mailing}</p></td>
     </tr>
-    <tr>
-        <th scope="row">{$lang->allow_message}</th>
-        <td>
-            <select name="allow_message">
-                <!--@foreach($lang->allow_message_type as $key => $val)-->
-                <option value="{$key}" <!--@if($member_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_allow_message}</p>
-        </td>
-    </tr>
     <tr>
         <th scope="row">{$lang->signature}</th>
         <td>{$editor}</td>

From d32060a57c30946794fbde944d0b10273cbe7ad0 Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 29 Apr 2008 05:03:29 +0000
Subject: [PATCH 065/111] =?UTF-8?q?1)=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=8B=9C=20img=20=ED=83=9C=EA=B7=B8=EC=9D=98?=
 =?UTF-8?q?=20align,=20border=20=EC=86=8D=EC=84=B1=20=EB=8C=80=EC=8B=A0=20?=
 =?UTF-8?q?inline=20style=EC=9D=84=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=ED=95=A8(#465)=202)=20align=5Fleft=EC=9D=98=20?=
 =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EA=B7=B8=EB=A6=BC=20=EB=B0=94?=
 =?UTF-8?q?=EB=A1=9C=EC=9E=A1=EC=9D=8C?=
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@4161 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../image_link/tpl/images/align_left.gif      | Bin 379 -> 359 bytes
 .../editor/components/image_link/tpl/popup.js |  23 ++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/modules/editor/components/image_link/tpl/images/align_left.gif b/modules/editor/components/image_link/tpl/images/align_left.gif
index f16697d91a260fdb90951372750a05db74b614c2..cc9a91b7352cac6460f442e677c2ca585cab4d95 100644
GIT binary patch
literal 359
zcmZ?wbhEHb6l0KLXk}msTB}#Ta9!g?ABQE9&MPEy4>%QHb<IBR6tG4oeZNi2ZllQU
zM&awt;`W+ee)Ip-+spoIwAS6&boI^u3opMpFPD7%<G=TM<-j$1{#$G(URrqO&CjQ=
zew3aIir8XgvsCK-{rjg*o%;X(KLgEx4#;GXUs&0C93~Wa=t#9LTvBv0MQQehXO|yy
zMyzkVkbc_N&vr(Sv(d$r#lhUm4|ar@MZOEOT&iQ$!2P7K&5x6dla-x~NiM2LK2E_?
zuA!-=El@F-nS)`*jP}^#DLsmE(`L?^>_2(w{N))dR|U=Q+^}KZ+SQ&Li#KlGvTob<
e?Ynk+`^R?d>sofO`{bcDCr_Mnzv%ABU=09_Hh=N}

literal 379
zcmZ?wbhEHb6l0KLxXQrr|NsB{_wS!Nbt-7Bp3PFJ`i1KP*65_~w`siS<Gez$`Js2i
zeK&_Ck}<oDvX46zUv(|J=9qiHY2A%Yr`}$E`szpNxu9b&-(Pt7En<t&#g`xbx7d2G
zQn~!*f8m~}*FXMyuUC%TZWOoIG<?0;>6dTsef;IWM(fO*pZC7}pLl6u;2OQFZ~i+k
zmt1yz$-_6F7{~&OKUu)~bU-A?PYi4`92yHebfj7vmK2>#QJQ_>nX$v#sP&Ccj8C!p
ztY^px)qYX7KgsasnY&C}A9l=fh}gxgc3Pu2urNTXq%75oRYX@sT~0_zQB=Ovt6W$|
zR$5h)Swca3Vzw6xhX6MhKc65wFXz0t7SDx?mo8tqy4jnBdFQU3Y&>i7cI@7@cmKK^
hzn09*`NvOqo=Qwudp79gsfaUIZr*agd)JY{8UU4=m|p+@

diff --git a/modules/editor/components/image_link/tpl/popup.js b/modules/editor/components/image_link/tpl/popup.js
index 2176f8505..6939bcdd7 100644
--- a/modules/editor/components/image_link/tpl/popup.js
+++ b/modules/editor/components/image_link/tpl/popup.js
@@ -21,8 +21,12 @@ function getImage() {
         return;
     }
     var src = node.getAttribute("src");
-    var border = node.getAttribute("border");
-    var align = node.getAttribute("align");
+    var border = node.style.borderWidth ? 
+        node.style.borderWidth.match("[0-9]+") : node.getAttribute("border");
+    var align = node.style.cssFloat ?
+        node.style.cssFloat : node.style.styleFloat;
+    if(!align) align = node.style.verticalAlign?
+        node.style.verticalAlign : node.getAttribute("align");
     var alt = node.getAttribute("alt");
     var width = xWidth(node);
     var height = xHeight(node);
@@ -79,9 +83,9 @@ function insertImage(obj) {
     var alt = xGetElementById("image_alt").value;
     var align = "";
     if(xGetElementById("align_normal").checked==true) align = "";
-    else if(xGetElementById("align_left").checked==true) align = "left";
-    else if(xGetElementById("align_middle").checked==true) align = "middle";
-    else if(xGetElementById("align_right").checked==true) align = "right";
+    else if(xGetElementById("align_left").checked==true) align = "float: left";
+    else if(xGetElementById("align_middle").checked==true) align = "vertical-align: middle";
+    else if(xGetElementById("align_right").checked==true) align = "float: right";
     var border = parseInt(xGetElementById("image_border").value,10);
 
     var width = xGetElementById("width").value;
@@ -93,13 +97,18 @@ function insertImage(obj) {
     }
 
     url = url.replace(request_uri,'');
-    var text = "<img editor_component=\"image_link\" src=\""+url+"\" border=\""+border+"\" ";
+    var text = "<img editor_component=\"image_link\" src=\""+url+"\" ";
     if(alt) text+= " alt=\""+alt+"\"";
     if(width) text+= " width=\""+width+"\" ";
     if(height) text+= " height=\""+height+"\" ";
     if(link_url) text+= " link_url=\""+link_url+"\" ";
     if(open_window=='Y') text+= " open_window=\"Y\" ";
-    if(align) text+= " align=\""+align+"\" ";
+    if(align || border){
+        text+= " style=\"";
+        if(align) text+= align+"; ";
+        if(border) text+= "border: solid "+border+"px; ";
+        text+= "\" ";
+    }
     text+= " />";
 
     opener.editorFocus(opener.editorPrevSrl);

From f4fadaabae41344fc83cc54b14381a2b912a2e0c Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Thu, 1 May 2008 08:36:16 +0000
Subject: [PATCH 066/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4162
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 common/lang/es.lang.php |   4 +-
 common/lang/ge.lang.php | 250 ++++++++++++++++++++++++++++++++++++++++
 common/lang/ru.lang.php |  22 ++--
 3 files changed, 263 insertions(+), 13 deletions(-)
 create mode 100644 common/lang/ge.lang.php

diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php
index 9873f95fb..406d8733a 100644
--- a/common/lang/es.lang.php
+++ b/common/lang/es.lang.php
@@ -193,7 +193,7 @@
     $lang->success_updated = 'Actualizado con éxito';
     $lang->success_deleted = 'Boarrado con éxito';
     $lang->success_voted = 'Recomendado con éxito';
-    $lang->success_blamed = 'Blamed success_blamed';
+    $lang->success_blamed = 'Culpó success_blamed';
     $lang->success_moved = 'Movido con éxito';
     $lang->success_sended = 'Enviado con éxito';
     $lang->success_reset = 'Reajustado con éxito';
@@ -204,7 +204,7 @@
     $lang->fail_to_move = 'No puede ser movido';
 
     $lang->failed_voted = 'No puede ser recomendado';
-    $lang->failed_blamed = 'Could not blame';
+    $lang->failed_blamed = 'No se ha podido culpa ';
     $lang->failed_declared = 'No se ha podido acusar';
     $lang->fail_to_delete_have_children = 'No puede ser borrado, ya que el mensaje posee respuestas ';
 
diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
new file mode 100644
index 000000000..baabd0133
--- /dev/null
+++ b/common/lang/ge.lang.php
@@ -0,0 +1,250 @@
+<?php
+    /**
+     * @file   common/lang/en.lang.php
+     * @author zero (zero@nzeo.com)
+     * @brief  English Language Pack (Only basic words are included here)
+     **/
+
+    // words for action, which is basically used
+    $lang->cmd_write = 'Schreiben';
+    $lang->cmd_reply = 'Antworten';
+    $lang->cmd_delete = 'Löschen';
+    $lang->cmd_modify = 'Ändern';
+    $lang->cmd_edit = 'Bearbeiten';
+    $lang->cmd_view = 'Anzeigen';
+    $lang->cmd_view_all = 'Alle anzeigen';
+    $lang->cmd_list = 'US -';
+    $lang->cmd_prev = 'Zurück';
+    $lang->cmd_next = 'Nächster';
+    // 여기에서부터 번역 시작필요..
+	$lang->cmd_send_trackback = 'Send Trackback';
+    $lang->cmd_registration = $lang->cmd_submit = 'Submit';
+    $lang->cmd_comment_registration = 'Add Comment';
+    $lang->cmd_insert = 'Insert';
+    $lang->cmd_save = 'Save';
+    $lang->cmd_load = 'Load';
+    $lang->cmd_input = 'Input';
+    $lang->cmd_search = 'Search';
+    $lang->cmd_cancel = 'Cancel';
+    $lang->cmd_back = 'Go Back';
+    $lang->cmd_vote = 'Recommend';
+    $lang->cmd_vote_down = 'Criticize';
+    $lang->cmd_declare = 'Accuse';
+    $lang->cmd_cancel_declare = 'Cancel Accuse';
+    $lang->cmd_declared_list = 'Accusations List';
+    $lang->cmd_copy = 'Copy';
+    $lang->cmd_move = 'Move';
+    $lang->cmd_move_up = 'Up';
+    $lang->cmd_move_down = 'Down';
+    $lang->cmd_add_indent = 'Indent';
+    $lang->cmd_remove_indent = 'Outdent';
+    $lang->cmd_management = 'Manage';
+    $lang->cmd_make = 'Create';
+    $lang->cmd_select = 'Select';
+    $lang->cmd_select_all = 'Select All';
+    $lang->cmd_unselect_all = 'Deselect All';
+    $lang->cmd_reverse_all = 'Reverse';
+    $lang->cmd_close_all = 'Close All';
+    $lang->cmd_open_all = 'Open All';
+    $lang->cmd_reload = 'Reload';
+    $lang->cmd_close = 'Close';
+    $lang->cmd_open = 'Open';
+    $lang->cmd_setup = 'Configure';
+    $lang->cmd_addition_setup = 'Additional Setup';
+	$lang->cmd_option = 'Option';
+    $lang->cmd_apply = 'Apply';
+    $lang->cmd_open_calendar = 'Select a Date';
+    $lang->cmd_send = 'Send';
+    $lang->cmd_print = 'Print';
+    $lang->cmd_scrap = 'Scrap';
+    $lang->cmd_preview = 'Preview';
+    $lang->cmd_reset = 'Reset';
+    $lang->cmd_remake_cache = "Re-create cache file";
+    $lang->cmd_publish = "Publish";
+    $lang->cmd_layout_setup = 'Configure layout';
+    $lang->cmd_layout_edit = 'Edit layout';
+
+    $lang->enable = 'Enable';
+    $lang->disable = 'Disable';
+
+    // Essential Words
+    $lang->no = 'No.';
+    $lang->notice = 'Notice';
+    $lang->secret = 'Secret';
+    $lang->category = $lang->category_srl = 'Category';
+    $lang->document_srl = 'Doc. No.';
+    $lang->user_id = 'User ID';
+    $lang->author = 'Developer';
+    $lang->password = 'Password';
+    $lang->password1 = 'Password';
+    $lang->password2 = 'Confirm Password';
+    $lang->admin_id = 'Admin ID';
+    $lang->writer = 'Author';
+    $lang->user_name = 'User Name';
+    $lang->nick_name = 'Nick Name';
+    $lang->email_address = 'Email';
+    $lang->homepage = 'Homepage';
+    $lang->blog = 'Blog';
+    $lang->birthday = 'Birthday';
+    $lang->browser_title = 'Browser Title';
+    $lang->title = 'Subject';
+    $lang->title_content = 'Subject+Content';
+    $lang->topic = 'Topic';
+    $lang->replies = 'Reply';
+    $lang->content = 'Content';
+    $lang->document = 'Article';
+    $lang->comment = 'Comment';
+    $lang->description = 'Description';
+    $lang->trackback = 'Trackback';
+    $lang->tag = 'Tag';
+    $lang->allow_comment = 'Allow Comments';
+    $lang->lock_comment = 'Block Comments';
+    $lang->allow_trackback = 'Allow Trackbacks';
+    $lang->uploaded_file = 'Attachment';
+    $lang->grant = 'Permission';
+    $lang->target = 'Target';
+    $lang->total = 'Total';
+    $lang->total_count = 'Count Total';
+    $lang->ipaddress = 'IP Address';
+    $lang->path = 'Path';
+    $lang->cart = 'Selected Item';
+    $lang->friend = 'Friends';
+    $lang->notify = 'Notification';
+    $lang->order_target = 'Align Target';
+    $lang->order_type = 'Sorting Type';
+    $lang->order_asc = 'ascend';
+    $lang->order_desc = 'descend';
+
+    $lang->mid = 'Module Name';
+    $lang->layout = 'Layout';
+    $lang->widget = 'Widget';
+    $lang->module = 'Module';
+    $lang->skin = 'Theme';
+    $lang->colorset = 'Colorset';
+    $lang->extra_vars = 'Extra Vars';
+
+    $lang->document_url = 'Article URL';
+    $lang->trackback_url = 'Trackback URL';
+    $lang->blog_name = 'Blog Title';
+    $lang->excerpt = 'Quotation';
+
+    $lang->document_count = 'Total Articles';
+    $lang->page_count = 'Page Count';
+    $lang->list_count = 'List Count';
+    $lang->search_list_count = 'Search List Count';
+    $lang->readed_count = 'Views';
+    $lang->voted_count = 'Votes';
+    $lang->comment_count = 'Comments';
+    $lang->member_count = 'Member Count';
+    $lang->date = 'Date';
+    $lang->regdate = 'Registered Date';
+    $lang->last_update = 'Last Update';
+    $lang->last_post = 'Last Post';
+    $lang->signup_date = 'Join Date';
+    $lang->last_login = 'Last Login';
+    $lang->first_page = 'First Page';
+    $lang->last_page = 'Last Page';
+    $lang->search_target = 'Target for Search';
+    $lang->search_keyword = 'Keyword';
+    $lang->is_default = 'Default';
+
+    $lang->no_documents = 'No Articles';
+
+    $lang->board_manager = 'Board Settings';
+    $lang->member_manager = 'Member Settings';
+    $lang->layout_manager = 'Layout Settings';
+
+    $lang->use = 'Use';
+    $lang->notuse = 'Not use';
+    $lang->not_exists = "Doesn't exist";
+
+    $lang->public = 'public';
+    $lang->private = 'private';
+
+    $lang->unit_sec = 'sec';
+    $lang->unit_min = 'min';
+    $lang->unit_hour = 'hr';
+    $lang->unit_day = 'th';
+    $lang->unit_week = 'week';
+    $lang->unit_month = 'month';
+    $lang->unit_year = 'year';
+
+    // Descriptions
+    $lang->about_tag = 'You may submit multiple tags by inserting commas(,) between each tag';
+    $lang->about_layout = 'Layouts decorate the appearance of your modules. you can configure them from Layout menu on the top';
+
+    // Messages
+    $lang->msg_call_server = 'Requesting to the server, please wait';
+    $lang->msg_db_not_setted = 'DB configuration has not been set';
+    $lang->msg_invalid_queryid = 'Specified query ID value is invalid';
+    $lang->msg_not_permitted = 'You do not have permission to access';
+    $lang->msg_input_password = 'Please input the password';
+    $lang->msg_invalid_document = 'Invalid Article Number';
+    $lang->msg_invalid_request = 'Invalid Request';
+    $lang->msg_invalid_password = 'Invalid Password';
+    $lang->msg_error_occured = 'An error has occured';
+    $lang->msg_not_founded = 'Target could not be found';
+    $lang->msg_no_result = 'Nothing found';
+
+    $lang->msg_not_permitted_act = 'You do not have permission to execute requested action';
+    $lang->msg_module_is_not_exists = 'Requested module could not be found';
+    $lang->msg_module_is_not_standalone = 'Requested module cannot be executed independently';
+
+    $lang->success_registed = 'Registered successfully';
+    $lang->success_declared = 'Accused successfully';
+    $lang->success_updated = 'Updated successfully';
+    $lang->success_deleted = 'Deleted successfully';
+    $lang->success_voted = 'Recommended successfully';
+    $lang->success_blamed = 'Blamed success_blamed';
+    $lang->success_moved = 'Moved successfully';
+    $lang->success_sended = 'Sent successfully';
+    $lang->success_reset = 'Reset successfully';
+    $lang->success_leaved = 'All member data have been deleted completely.';
+    $lang->success_saved = 'Saved successfully';
+
+    $lang->fail_to_delete = 'Could not be deleted';
+    $lang->fail_to_move = 'Could not be moved';
+
+    $lang->failed_voted = 'Could not recommend';
+    $lang->failed_blamed = 'Could not blame';
+    $lang->failed_declared = 'Could not accuse';
+    $lang->fail_to_delete_have_children = 'Please try again after removing replies first';
+
+    $lang->confirm_submit = 'Are you sure to submit?';
+    $lang->confirm_logout = 'Are you sure to logout?';
+    $lang->confirm_vote = 'Are you sure to recommend?';
+    $lang->confirm_delete = 'Are you sure to delete?';
+    $lang->confirm_move = 'Are you sure to move?';
+    $lang->confirm_reset = 'Are you sure to reset?';
+    $lang->confirm_leave = 'Are you sure to leave?';
+
+    $lang->column_type = 'Column Type';
+    $lang->column_type_list['text'] = 'one-line text';
+    $lang->column_type_list['homepage'] = 'url';
+    $lang->column_type_list['email_address'] = 'email';
+    $lang->column_type_list['tel'] = 'phone number';
+    $lang->column_type_list['textarea'] = 'multi-line textarea';
+    $lang->column_type_list['checkbox'] = 'checkbox (multiple selection)';
+    $lang->column_type_list['select'] = 'select box (single selection)';
+    $lang->column_type_list['kr_zip'] = 'zip code (Korean)';
+    $lang->column_type_list['date'] = 'date (yyyy/mm/dd)';
+    //$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
+    $lang->column_name = 'Column Name';
+    $lang->column_title = 'Column Title';
+    $lang->default_value = 'Default Value';
+    $lang->is_active = 'Active';
+    $lang->is_required = 'Required Field';
+
+    // Alert messages for Javascript using by XML filter
+    $lang->filter->isnull = 'Please input a value for %s';
+    $lang->filter->outofrange = 'Please align the text length of %s';
+    $lang->filter->equalto = "The value of %s is invalid";
+    $lang->filter->invalid_email = "The format of %s is invalid. ex) zbxe@zeroboard.com";
+    $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "The format of %s is invalid.\\nAll values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet";
+    $lang->filter->invalid_homepage = "The format of %s is invalid. ex) http://www.zeroboard.com";
+    $lang->filter->invalid_korean = "The format of %s is invalid. Please input Korean only";
+    $lang->filter->invalid_korean_number = "The format of %s is invalid. Please input Korean or numbers";
+    $lang->filter->invalid_alpha = "The format of %s is invalid. Please input alphabets only";
+    $lang->filter->invalid_alpha_number = "The format of %s is invalid. Please input alphabets or numbers";
+    $lang->filter->invalid_number = "The format of %s is invalid. Please input numbers only";
+?>
diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php
index 5d3e9b705..ad5692f56 100644
--- a/common/lang/ru.lang.php
+++ b/common/lang/ru.lang.php
@@ -194,7 +194,7 @@
     $lang->success_updated = 'Обновление успешно';
     $lang->success_deleted = 'Удалено успешно';
     $lang->success_voted = 'Рекомендовано успешно';
-    $lang->success_blamed = 'Blamed success_blamed';
+    $lang->success_blamed = 'Обвиняют success_blamed';
     $lang->success_moved = 'Перемещено успешно';
     $lang->success_sended = 'Отправлено успешно';
     $lang->success_reset = 'Сброшено успешно';
@@ -205,7 +205,7 @@
     $lang->fail_to_move = 'Не может быть перемещено';
 
     $lang->failed_voted = 'Ошибка при рекомендации';
-    $lang->failed_blamed = 'Could not blame';
+    $lang->failed_blamed = 'Не виноват';
     $lang->failed_declared = 'Ошибка при обвинении';
     $lang->fail_to_delete_have_children = 'Пожалуйста, попробуйте еще после удаления дочерних объектов';
 
@@ -218,16 +218,16 @@
     $lang->confirm_leave = 'Вы подтверждаете уход?';
 
     $lang->column_type = 'Тип колонки';
-    $lang->column_type_list['text'] = 'one-line text';
+    $lang->column_type_list['text'] = 'одна строка текста';
     $lang->column_type_list['homepage'] = 'url';
-    $lang->column_type_list['email_address'] = 'email';
-    $lang->column_type_list['tel'] = 'phone number';
-    $lang->column_type_list['textarea'] = 'multi-line textarea';
-    $lang->column_type_list['checkbox'] = 'checkbox (multiple selection)';
-    $lang->column_type_list['select'] = 'select box (single selection)';
-    $lang->column_type_list['kr_zip'] = 'zip code (Korean)';
-    $lang->column_type_list['date'] = 'date (yyyy/mm/dd)';
-    //$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
+    $lang->column_type_list['email_address'] = 'по электронной почте';
+    $lang->column_type_list['tel'] = 'номер телефона';
+    $lang->column_type_list['textarea'] = 'многолетних-лайн textarea';
+    $lang->column_type_list['checkbox'] = 'флажок (несколько отбор)';
+    $lang->column_type_list['select'] = 'выберите поле (один отбор)';
+    $lang->column_type_list['kr_zip'] = 'почтовый индекс (корейский)';
+    $lang->column_type_list['date'] = 'Дата (гггг / мм / дд)';
+    //$lang->column_type_list['jp_zip'] = 'почтовый индекс (японский)';
     $lang->column_name = 'Имя колонки';
     $lang->column_title = 'Название колонки';
     $lang->default_value = 'Стандартное значение';

From b67dcb1d3f559a8652f5289eed56fdf10c6c816e Mon Sep 17 00:00:00 2001
From: wdlee91 <wdlee91@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Thu, 1 May 2008 12:50:35 +0000
Subject: [PATCH 067/111] =?UTF-8?q?addon=20autolink:=20script=20=EC=A0=84?=
 =?UTF-8?q?=ED=9B=84=EB=A1=9C=20CDATA=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@4163 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/autolink/autolink.addon.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
index a7b7f44cd..b264eed53 100644
--- a/addons/autolink/autolink.addon.php
+++ b/addons/autolink/autolink.addon.php
@@ -14,7 +14,9 @@
         $script_code = <<<EndOfScript
 
     <script type="text/javascript"> 
-        var url_regx = new RegExp("(http|https|ftp|news)://([-/.a-zA-Z0-9_~#%$?&=:200-377()]+)","gi");  function replaceHrefLink(obj) {  while(obj) {  if(obj.nodeType == 3) {  var text = obj.data;  if(url_regx.test(text)) {  var html = text.replace(url_regx,"<a href=\"$1://$2\" onclick=\"window.open(this.href); return false;\">$1://$2</a>");  var dummy = xCreateElement('span');  xInnerHtml(dummy, html);  obj.parentNode.insertBefore(dummy, obj);  obj.parentNode.removeChild(obj);  }  }  if(obj.firstChild) replaceHrefLink(obj.firstChild);  obj = obj.nextSibling;  }  } function addUrlLink() {   var objs = xGetElementsByClassName('xe_content');  if(objs.length<1) return;  for(var i=0;i<objs.length;i++) {   replaceHrefLink(objs[i].firstChild);  xAddEventListener(objs[i], 'mouseover', showUrlOpener);  }  }  function showUrlOpener(e) {   var evt = new xEvent(e);  var obj = evt.target;  var layer = xGetElementById('zbXEUrlOpener');  if(!layer) {   layer = xCreateElement('div');  layer.style.position = 'absolute';  layer.style.border = '3px solid #DDDDDD';  layer.style.backgroundColor = '#FFFFFF';  layer.style.padding = '5px';  layer.style.visibility = 'hidden';  layer.style.lineHeight = '1.6';  layer.setAttribute('id','zbXEUrlOpener');  document.body.appendChild(layer);  }  if(obj && obj.nodeName == 'A' && obj.getAttribute('href') && !/#/.test(obj.getAttribute('href'))) {   var href = obj.getAttribute('href');  if(href.length>40) href = href.substr(0,40)+'...';  var html = ''+   '<a href="'+obj.getAttribute('href')+'" onclick="window.open(this.href); return false;" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_new_window}]<br />'+  '<a href="'+obj.getAttribute('href')+'" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_cur_window}]'+   '';  xInnerHtml(layer, html);  xLeft(layer, evt.pageX-20);  xTop(layer, evt.pageY-10);  layer.style.visibility = 'visible';  } else {   layer.style.visibility = 'hidden';  }  }   xAddEventListener(window,'load', addUrlLink);   
+    // <![CDATA[
+        var url_regx = new RegExp("(http|https|ftp|news)://([-/.a-zA-Z0-9_~#%$?&=:200-377()]+)","gi");  function replaceHrefLink(obj) {  while(obj) {  if(obj.nodeType == 3) {  var text = obj.data;  if(url_regx.test(text)) {  var html = text.replace(url_regx,"<a href=\"$1://$2\" onclick=\"window.open(this.href); return false;\">$1://$2</a>");  var dummy = xCreateElement('span');  xInnerHtml(dummy, html);  obj.parentNode.insertBefore(dummy, obj);  obj.parentNode.removeChild(obj);  }  }  if(obj.firstChild) replaceHrefLink(obj.firstChild);  obj = obj.nextSibling;  }  } function addUrlLink() {   var objs = xGetElementsByClassName('xe_content');  if(objs.length<1) return;  for(var i=0;i<objs.length;i++) {   replaceHrefLink(objs[i].firstChild);  xAddEventListener(objs[i], 'mouseover', showUrlOpener);  }  }  function showUrlOpener(e) {   var evt = new xEvent(e);  var obj = evt.target;  var layer = xGetElementById('zbXEUrlOpener');  if(!layer) {   layer = xCreateElement('div');  layer.style.position = 'absolute';  layer.style.border = '3px solid #DDDDDD';  layer.style.backgroundColor = '#FFFFFF';  layer.style.padding = '5px';  layer.style.visibility = 'hidden';  layer.style.lineHeight = '1.6';  layer.setAttribute('id','zbXEUrlOpener');  document.body.appendChild(layer);  }  if(obj && obj.nodeName == 'A' && obj.getAttribute('href') && !/#/.test(obj.getAttribute('href'))) {   var href = obj.getAttribute('href');  if(href.length>40) href = href.substr(0,40)+'...';  var html = ''+   '<a href="'+obj.getAttribute('href')+'" onclick="window.open(this.href); return false;" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_new_window}]<br />'+  '<a href="'+obj.getAttribute('href')+'" style="text-decoration:none; color:#555555;">'+href+'</a> [{$open_cur_window}]'+   '';  xInnerHtml(layer, html);  xLeft(layer, evt.pageX-20);  xTop(layer, evt.pageY-10);  layer.style.visibility = 'visible';  } else {   layer.style.visibility = 'hidden';  }  }   xAddEventListener(window,'load', addUrlLink);
+    // ]]>
     </script>
 
 EndOfScript;

From 4f696906091d1ffbe89d3f695a874f5836d772ad Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 2 May 2008 06:26:00 +0000
Subject: [PATCH 068/111] =?UTF-8?q?#468=20=EA=B4=80=EB=A0=A8=20=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20group=20=ED=83=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=A7=80=EC=9B=90?=
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@4164 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/layout/layout.model.php       | 48 +++++++++++++++------------
 modules/layout/tpl/layout_modify.html | 18 ++++++++++
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index c4ebac355..a1d87caf6 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -147,31 +147,37 @@
             $buff .= sprintf('$layout_info->author->description = "%s";', $xml_obj->author->description->body);
 
             // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
-            $extra_vars = $xml_obj->extra_vars->var;
-            if($extra_vars) {
-                if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+            $extra_var_groups = $xml_obj->extra_vars->group;
+            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+            foreach($extra_var_groups as $group){
+                $extra_vars = $group->var;
+                if($extra_vars) {
+                    if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
-                $extra_var_count = count($extra_vars);
-                
-                $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
-                for($i=0;$i<$extra_var_count;$i++) {
-                    unset($var);
-                    unset($options);
-                    $var = $extra_vars[$i];
-                    $name = $var->attrs->name;
+                    $extra_var_count = count($extra_vars);
 
-                    $buff .= sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
-                    $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
-                    $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
-                    $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
+                    $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
+                    for($i=0;$i<$extra_var_count;$i++) {
+                        unset($var);
+                        unset($options);
+                        $var = $extra_vars[$i];
+                        $name = $var->attrs->name;
 
-                    $options = $var->options;
-                    if(!$options) continue;
+                        $buff .= sprintf('$layout_info->extra_var->%s->group = "%s";', $name, $group->title->body);
+                        $buff .= sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
+                        $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
+                        $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
+                        $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
 
-                    if(!is_array($options)) $options = array($options);
-                    $options_count = count($options);
-                    for($j=0;$j<$options_count;$j++) {
-                        $buff .= sprintf('$layout_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->title->body);
+                        $options = $var->options;
+                        if(!$options) continue;
+
+                        if(!is_array($options)) $options = array($options);
+                        $options_count = count($options);
+                        for($j=0;$j<$options_count;$j++) {
+                            $buff .= sprintf('$layout_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->title->body);
+                        }
                     }
                 }
             }
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index 50e74275b..1364131c5 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -52,6 +52,16 @@
         </td>
     </tr>
     <!--@foreach($selected_layout->extra_var as $name => $var)-->
+
+    <!--@if($var->group && ((!$group) || $group != $var->group))-->
+    {@$group = $var->group}
+    </table>
+    <table cellspacing="0" class="adminTable">
+    <col width="150" />
+    <col width="*" />
+    <caption>{$group}</caption>
+    <!--@end-->
+
     <tr>
         <th scope="row">{$var->title}</th>
 
@@ -85,6 +95,14 @@
         </td>
     </tr>
     <!--@end-->
+
+    <!--@if($var->group)-->
+    </table>
+    <table cellspacing="0" class="adminTable">
+    <col width="150" />
+    <col width="*" />
+    <!--@end-->
+
     <!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
     <tr>
         <th scope="row">{$menu_info->title}<br />({$menu_name})</th>

From ed241073239982da171d19bbbb51af10492bae83 Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 2 May 2008 06:31:34 +0000
Subject: [PATCH 069/111] =?UTF-8?q?0.2.9=EC=9D=98=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=EC=9D=84=20=EB=B0=98=EC=98=81=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?=
 =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EB=B0=94=EB=A1=9C=EC=9E=A1=EC=9D=8C?=
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@4165 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/skins/xe_board/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/board/skins/xe_board/header.html b/modules/board/skins/xe_board/header.html
index fec106778..82a774750 100644
--- a/modules/board/skins/xe_board/header.html
+++ b/modules/board/skins/xe_board/header.html
@@ -94,7 +94,7 @@
             <li class="loginAndLogout"><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
             <!--@end-->
 
-        <!-- 로그인 되어 있지 않고 레이아웃이 없으면 -->
+        <!-- 로그인 되어 있지 않고 회원정보 버튼 출력하도록 되어있으면 -->
         <!--@elseif(!$is_logged && $module_info->display_login_info != 'N')-->
             <li class="join"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
             <li class="loginAndLogout"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>

From adc4ca1bfedffb7ca08f40876f4f0d09ecb966e5 Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 2 May 2008 06:46:27 +0000
Subject: [PATCH 070/111] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=20=EC=82=AC=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EC=9C=84?=
 =?UTF-8?q?=EC=A0=AF=20=EC=84=A4=EB=AA=85=EC=9D=B4=20=EC=95=88=20=EB=82=98?=
 =?UTF-8?q?=EC=98=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
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@4166 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/widget/tpl/downloaded_widget_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/widget/tpl/downloaded_widget_list.html b/modules/widget/tpl/downloaded_widget_list.html
index a77e038e1..488d9cd0c 100644
--- a/modules/widget/tpl/downloaded_widget_list.html
+++ b/modules/widget/tpl/downloaded_widget_list.html
@@ -1,7 +1,7 @@
 <h3>{$lang->widget} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <!-- 설명 -->
-<div class="infoText">{nl2br($lang->about_addon)}</div>
+<div class="infoText">{nl2br($lang->about_widget)}</div>
 
 <!-- 위젯의 목록 -->
 <table cellspacing="0" class="adminTable">

From 9ed3dd31210a702d8daa82c0236ed652dff4b0f0 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 2 May 2008 06:58:26 +0000
Subject: [PATCH 071/111] =?UTF-8?q?=EC=8A=A4=ED=8C=B8=ED=95=84=ED=84=B0=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=8B=9C=20=EC=B2=98=EB=A6=AC=20=EA=B0=84?=
 =?UTF-8?q?=EA=B2=A9=EC=9D=84=200=EC=9C=BC=EB=A1=9C=20=ED=95=A0=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EB=8F=99=EC=9E=91=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
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@4167 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/spamfilter/spamfilter.model.php | 3 ++-
 modules/spamfilter/tpl/index.html       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php
index 2686c977c..3cc2d2e87 100644
--- a/modules/spamfilter/spamfilter.model.php
+++ b/modules/spamfilter/spamfilter.model.php
@@ -90,7 +90,8 @@
         function checkLimited() {
             $config = $this->getConfig();
             $limit_count = $config->limit_count?$config->limit_count:5;
-            $interval = $config->interval?$config->interval:60;
+            $interval = $config->interval;
+            if(!$interval) return new Object();
 
             $count = $this->getLogCount($interval);
 
diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html
index 9aed022cb..3da31de97 100644
--- a/modules/spamfilter/tpl/index.html
+++ b/modules/spamfilter/tpl/index.html
@@ -10,7 +10,7 @@
     <tr>
         <th scope="col">{$lang->interval}</th>
         <td class="left">
-            <input type="text" name="interval" value="{$config->interval?$config->interval:60}" class="inputTypeText" /> {$lang->unit_sec}
+            <input type="text" name="interval" value="{$config->interval}" class="inputTypeText" /> {$lang->unit_sec}
             <p>{$lang->about_interval}</p>
         </td>
     </tr>

From e11657427ee7cd427b7c30c29712ef99c52c240c Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sat, 3 May 2008 01:18:54 +0000
Subject: [PATCH 072/111] =?UTF-8?q?#468=20=EA=B4=80=EB=A0=A8=20=EC=9C=84?=
 =?UTF-8?q?=EC=A0=AF=20group=20=ED=83=9C=EA=B7=B8=20=EC=A7=80=EC=9B=90?=
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@4168 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/widget/tpl/widget_generate_code.html  | 22 ++++++-
 .../tpl/widget_generate_code_in_page.html     | 13 ++++-
 modules/widget/widget.model.php               | 58 ++++++++++---------
 3 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html
index 0a3ed9bcd..a5d9bac01 100644
--- a/modules/widget/tpl/widget_generate_code.html
+++ b/modules/widget/tpl/widget_generate_code.html
@@ -11,8 +11,6 @@
     </div>
 
     <div id="popBody">
-
-
         <table cellspacing="0" class="adminTable">
         <col width="100" />
         <col />
@@ -49,7 +47,17 @@
                 <p>{$lang->about_widget_cache}</p>
             </td>
         </tr>
-            <!--@foreach($widget_info->extra_var as $id => $var)-->
+        <!--@foreach($widget_info->extra_var as $id => $var)-->
+
+        <!--@if($var->group && ((!$group) || $group != $var->group))-->
+        {@$group = $var->group}
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="150" />
+        <col width="*" />
+        <caption>{$group}</caption>
+        <!--@end-->
+
         <tr>
             <th scope="row">
                 {$var->name}
@@ -92,6 +100,14 @@
             </td>
         </tr>
         <!--@end-->
+
+        <!--@if($group)-->
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="150" />
+        <col width="*" />
+        <!--@end-->
+
         <tr>
             <th>{$lang->widget_code}</th>
             <td><textarea readonly="true" id="widget_code" class="inputTypeTextArea w100"></textarea></td>
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index 2c6e2722f..9fe406b9b 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -18,7 +18,6 @@
     </div>
 
     <div id="popBody">
-
         <table cellspacing="0" class="adminTable">
         <col width="150" />
         <col />
@@ -60,7 +59,17 @@
                 <p>{$lang->about_widget_cache}</p>
             </td>
         </tr>
-            <!--@foreach($widget_info->extra_var as $id => $var)-->
+        <!--@foreach($widget_info->extra_var as $id => $var)-->
+
+        <!--@if($var->group && ((!$group) || $group != $var->group))-->
+        {@$group = $var->group}
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="150" />
+        <col width="*" />
+        <caption>{$group}</caption>
+        <!--@end-->
+
         <tr>
             <th scope="row">
                 {$var->name}
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index 91c8ac776..5f937b26a 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -93,36 +93,42 @@
             $buff .= sprintf('$widget_info->author->description = "%s";', $xml_obj->author->description->body);
 
             // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
-            if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var;
-            else $extra_vars = $xml_obj->extra_vars->var;
+            $extra_var_groups = $xml_obj->extra_vars->group;
+            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+            foreach($extra_var_groups as $group){
+                $extra_vars = $group->var;
+                if(!is_array($group->var)) $extra_vars = array($group->var);
+    
+                if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
+                    $extra_var_count = count($extra_vars);
+    
+                    $buff .= sprintf('$widget_info->extra_var_count = "%s";', $extra_var_count);
+                    for($i=0;$i<$extra_var_count;$i++) {
+                        unset($var);
+                        unset($options);
+                        $var = $extra_vars[$i];
 
-            if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
-                $extra_var_count = count($extra_vars);
+                        $id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
+                        $name = $var->name->body?$var->name->body:$var->title->body;
+                        $type = $var->attrs->type?$var->attrs->type:$var->type->body;
 
-                $buff .= sprintf('$widget_info->extra_var_count = "%s";', $extra_var_count);
-                for($i=0;$i<$extra_var_count;$i++) {
-                    unset($var);
-                    unset($options);
-                    $var = $extra_vars[$i];
+                        $buff .= sprintf('$widget_info->extra_var->%s->group = "%s";', $id, $group->title->body);
+                        $buff .= sprintf('$widget_info->extra_var->%s->name = "%s";', $id, $name);
+                        $buff .= sprintf('$widget_info->extra_var->%s->type = "%s";', $id, $type);
+                        $buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
+                        $buff .= sprintf('$widget_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
+    
+                        $options = $var->options;
+                        if(!$options) continue;
 
-                    $id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
-                    $name = $var->name->body?$var->name->body:$var->title->body;
-                    $type = $var->attrs->type?$var->attrs->type:$var->type->body;
-
-                    $buff .= sprintf('$widget_info->extra_var->%s->name = "%s";', $id, $name);
-                    $buff .= sprintf('$widget_info->extra_var->%s->type = "%s";', $id, $type);
-                    $buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
-                    $buff .= sprintf('$widget_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
-
-                    $options = $var->options;
-                    if(!$options) continue;
-
-                    if(!is_array($options)) $options = array($options);
-                    $options_count = count($options);
-                    for($j=0;$j<$options_count;$j++) {
-                        $buff .= sprintf('$widget_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
+                        if(!is_array($options)) $options = array($options);
+                        $options_count = count($options);
+                        for($j=0;$j<$options_count;$j++) {
+                            $buff .= sprintf('$widget_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
+                        }
+    
                     }
-
                 }
             }
 

From 09095c50690e60e70645e0948415dc5c3a6e781f Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sat, 3 May 2008 02:29:57 +0000
Subject: [PATCH 073/111] =?UTF-8?q?#468=20=EA=B4=80=EB=A0=A8=20=EC=95=A0?=
 =?UTF-8?q?=EB=93=9C=EC=98=A8=20group=20=ED=83=9C=EA=B7=B8=20=EC=A7=80?=
 =?UTF-8?q?=EC=9B=90?=
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@4169 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/addon/addon.admin.model.php | 46 ++++++++++++++++-------------
 modules/addon/tpl/setup_addon.html  | 17 +++++++++++
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php
index e0b5ae15a..760c1c071 100644
--- a/modules/addon/addon.admin.model.php
+++ b/modules/addon/addon.admin.model.php
@@ -123,32 +123,38 @@
 
             if($xml_obj->extra_vars) {
                 // 확장변수를 정리
-                if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var;
-                else $extra_vars = $xml_obj->extra_vars->var;
+                $extra_var_groups = $xml_obj->extra_vars->group;
+                if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+                if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+                foreach($extra_var_groups as $group) {
+                    $extra_vars = $group->var;
+                    if(!is_array($group->var)) $extra_vars = array($group->var);
 
-                foreach($extra_vars as $key => $val) {
-                    unset($obj);
-                    if(!$val->type->body) { $val->type->body = 'text'; }
+                    foreach($extra_vars as $key => $val) {
+                        unset($obj);
+                        if(!$val->type->body) { $val->type->body = 'text'; }
 
-                    $obj->name = $val->attrs->name;
-                    $obj->title = $val->title->body;
-                    $obj->type = $val->type->body;
-                    $obj->description = $val->description->body;
-                    $obj->value = $extra_vals->{$obj->name};
-                    if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
-                    if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
+                        $obj->group = $group->title->body;
+                        $obj->name = $val->attrs->name;
+                        $obj->title = $val->title->body;
+                        $obj->type = $val->type->body;
+                        $obj->description = $val->description->body;
+                        $obj->value = $extra_vals->{$obj->name};
+                        if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
+                        if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
 
-                    // 'select'type에서 option목록을 구한다.
-                    if(is_array($val->options)) {
-                        $option_count = count($val->options);
+                        // 'select'type에서 option목록을 구한다.
+                        if(is_array($val->options)) {
+                            $option_count = count($val->options);
 
-                        for($i = 0; $i < $option_count; $i++) {
-                            $obj->options[$i]->title = $val->options[$i]->title->body;
-                            $obj->options[$i]->value = $val->options[$i]->value->body;
+                            for($i = 0; $i < $option_count; $i++) {
+                                $obj->options[$i]->title = $val->options[$i]->title->body;
+                                $obj->options[$i]->value = $val->options[$i]->value->body;
+                            }
                         }
-                    }
 
-                    $addon_info->extra_vars[] = $obj;
+                        $addon_info->extra_vars[] = $obj;
+                    }
                 }
             }
 
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html
index 19268a677..bffbb436f 100644
--- a/modules/addon/tpl/setup_addon.html
+++ b/modules/addon/tpl/setup_addon.html
@@ -27,6 +27,16 @@
         </tr>
 
         <!--@foreach($addon_info->extra_vars as $id => $var)-->
+
+        <!--@if($var->group && ((!$group) || $group != $var->group))-->
+        {@$group = $var->group}
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="100" />
+        <col width="*" />
+        <caption>{$group}</caption>
+        <!--@end-->
+
         <tr>
             <th scope="row">{$var->title}</th>
             <td>
@@ -48,6 +58,13 @@
         </tr>
         <!--@end-->
 
+        <!--@if($group)-->
+        </table>
+        <table cellspacing="0" class="adminTable">
+        <col width="100" />
+        <col width="*" />
+        <!--@end-->
+
         <tr>
             <th scope="row">
                 {$lang->module}

From eafaaadcfa52f5b51c4eca64bd71f87b2d7a9894 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sat, 3 May 2008 12:56:53 +0000
Subject: [PATCH 074/111] =?UTF-8?q?toggleDisplay()=20=EB=91=90=EB=B2=88?=
 =?UTF-8?q?=EC=A7=B8=20=EC=9D=B8=EC=9E=90=EB=A5=BC=20=EC=A0=9C=EB=8C=80?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B2=98=EB=A6=AC=ED=95=98=EC=A7=80=20=EB=AA=BB?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
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@4170 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/common.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/js/common.js b/common/js/common.js
index dc50d4a04..2751bf4e0 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -178,12 +178,12 @@ function move_url(url, open_wnidow) {
 /**
  * @brief 특정 div(or span...)의 display옵션 토글
  **/
-function toggleDisplay(obj, opt) {
-    obj = xGetElementById(obj);
+function toggleDisplay(obj, display_type) {
+    var obj = xGetElementById(obj);
     if(!obj) return;
-    if(typeof(opt)=="undefined") opt = "inline";
-    if(!obj.style.display || obj.style.display == "block") obj.style.display = 'none';
-    else obj.style.display = opt;
+    if(typeof(display_type)=="undefined") display_type = "inline";
+    if(!obj.style.display || obj.style.display == display_type) obj.style.display = 'none';
+    else obj.style.display = display_type;
 }
 
 /**

From c7d699efccfd02156ea7698a5294206a7024ffdc Mon Sep 17 00:00:00 2001
From: supershop <supershop@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sat, 3 May 2008 15:52:59 +0000
Subject: [PATCH 075/111] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EB=B2=88=EC=97=AD?=
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@4171 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/lang/en.lang.php   | 2 +-
 modules/install/lang/en.lang.php | 4 ++--
 modules/point/lang/en.lang.php   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/board/lang/en.lang.php b/modules/board/lang/en.lang.php
index 3e9e0d183..f25bbe2b8 100644
--- a/modules/board/lang/en.lang.php
+++ b/modules/board/lang/en.lang.php
@@ -30,7 +30,7 @@
     // blah blah..
     $lang->about_category_title = 'Please input category name';
     $lang->about_expand = 'By selecting this option, it will be always expanded';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
+    $lang->about_category_group_srls = 'Only selected group will be able to use current category';
     $lang->about_layout_setup = 'You can manually modify board layout code. Insert or manage the widget code anywhere you want';
     $lang->about_board_category = 'You can make board categories.<br />When board category is broken, try rebuilding the cache file manually.';
     $lang->about_except_notice = "Notice articles will not be displayed on normal list.";
diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php
index 595ae3971..7829a59d1 100644
--- a/modules/install/lang/en.lang.php
+++ b/modules/install/lang/en.lang.php
@@ -169,8 +169,8 @@ EndOfLicense;
     $lang->about_rewrite = "If web server provides rewrite mod, long URL such as http://blah/?document_srl=123 can be shortened like http://blah/123";
     $lang->time_zone = 'Time zone';
     $lang->about_time_zone = "If the server time and the time on your location don't accord each other, you can set the time as same as your location by using time zone ";
-    $lang->qmail_compatibility = 'Qmail 호환';
-    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
+    $lang->qmail_compatibility = 'Enable Qmail';
+    $lang->about_qmail_compatibility = 'It will enable sending mails from MTA which cannot distinguish CRLF like Qmail.';
 
     $lang->about_database_file = 'Sqlite saves data in the file. Location of the database file should be unreachable by web<br/><span style="color:red">Data file should be inside the permission of 707.</span>';
 
diff --git a/modules/point/lang/en.lang.php b/modules/point/lang/en.lang.php
index 77c320830..3bfea5867 100644
--- a/modules/point/lang/en.lang.php
+++ b/modules/point/lang/en.lang.php
@@ -31,8 +31,8 @@
     $lang->cmd_exp_calc = 'Calculate';
     $lang->cmd_exp_reset = 'Reset';
 
-    $lang->cmd_point_recal = '포인트 초기화';
-    $lang->about_cmd_point_recal = '게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전등을 하여 포인트를 완전히 초기화 해야 할 경우에만 사용하세요.';
+    $lang->cmd_point_recal = 'Reset Point';
+	$lang->about_cmd_point_recal = 'All point will be initialized only with articles/comments/attachments/join points.<br />Only members who do website activities will get signup points after reset.<br />Please use this function when complete initialization is required in case of data transferring or other situations.';
 
     $lang->point_link_group = 'Group Change by Level';
     $lang->about_point_link_group = 'If you specify level for a specific group, users are assigned into the group when they adavnce to the level by getting points. When new group is assigned, the user is removed from the former assigned group.';

From 01cb5a8ebfb47dcd3f12893d0b15cfd969fdc32e Mon Sep 17 00:00:00 2001
From: supershop <supershop@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sat, 3 May 2008 15:55:22 +0000
Subject: [PATCH 076/111] =?UTF-8?q?=EC=98=81=EC=96=B4=20-=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EB=B2=88=EC=97=AD?=
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@4172 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/point_status/conf/info.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/widgets/point_status/conf/info.xml b/widgets/point_status/conf/info.xml
index 0027df8c6..0a79c135e 100644
--- a/widgets/point_status/conf/info.xml
+++ b/widgets/point_status/conf/info.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <widget version="0.1">
     <title xml:lang="ko">포인트 현황 출력 위젯</title>
+    <title xml:lang="en">Point Status</title>
     <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 23">
         <name xml:lang="ko">제로</name>
+		<name xml:lang="en">Zero</name>
         <description xml:lang="ko">
             로그인한 회원의 포인트 현황을 출력하는 위젯입니다.
             캐시는 0으로 해주셔야 합니다.
+        </description>
+		<description xml:lang="en">
+            This widget displays online members' points status.
+            Cache must be 0.
         </description>
     </author>
 </widget>

From 0e793fb2d6b68417eb91df78dfcea336c9fe9d67 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sun, 4 May 2008 05:08:02 +0000
Subject: [PATCH 077/111] =?UTF-8?q?toggleDisplay()=20IE=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20dispaly=5Ftype=EC=9D=B4=20'table'=EC=9D=BC=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=ED=91=9C=EC=8B=9C=ED=95=98=EC=A7=80=20=EB=AA=BB?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95.?=
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@4173 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/common.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/js/common.js b/common/js/common.js
index 2751bf4e0..d92284fcf 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -38,7 +38,7 @@ String.prototype.setQuery = function(key, val) {
 
         var q_list = new Array();
         for(var i in args) {
-	    if( !args.hasOwnProperty(i) ) continue;
+        if( !args.hasOwnProperty(i) ) continue;
             var arg = args[i];
             if(!arg.toString().trim()) continue;
 
@@ -176,14 +176,17 @@ function move_url(url, open_wnidow) {
 }
 
 /**
- * @brief 특정 div(or span...)의 display옵션 토글
+ * @brief 특정 Element의 display 옵션 토글
  **/
 function toggleDisplay(obj, display_type) {
     var obj = xGetElementById(obj);
     if(!obj) return;
-    if(typeof(display_type)=="undefined") display_type = "inline";
-    if(!obj.style.display || obj.style.display == display_type) obj.style.display = 'none';
-    else obj.style.display = display_type;
+    if(!obj.style.display || obj.style.display != 'none') {
+        obj.style.display = 'none';
+    } else {
+        if(display_type) obj.style.display = display_type;
+        else obj.style.display = '';
+    }
 }
 
 /**

From b858a7b0d03d28c62f21c129c2e4e2fc92c21031 Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 4 May 2008 16:11:30 +0000
Subject: [PATCH 078/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4174
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 addons/autolink/lang/es.lang.php | 6 +++---
 addons/autolink/lang/ge.lang.php | 6 +++---
 addons/autolink/lang/ru.lang.php | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/autolink/lang/es.lang.php b/addons/autolink/lang/es.lang.php
index 8ede9189e..1547de58c 100644
--- a/addons/autolink/lang/es.lang.php
+++ b/addons/autolink/lang/es.lang.php
@@ -1,9 +1,9 @@
 <?php
     /**
-     * @file   addons/autolink/lang/ko.lang.php
+     * @file   addons/autolink/lang/es.lang.php
      * @author zero (zero@zeroboard.com)
      * @brief  한국어 언어팩 (기본적인 내용만 수록)
      **/
-    $lang->open_cur_window = "현재창";
-    $lang->open_new_window = "새창";
+    $lang->open_cur_window = "ventana actual";
+    $lang->open_new_window = "una nueva ventana";
 ?>
diff --git a/addons/autolink/lang/ge.lang.php b/addons/autolink/lang/ge.lang.php
index 8ede9189e..4d66a5258 100644
--- a/addons/autolink/lang/ge.lang.php
+++ b/addons/autolink/lang/ge.lang.php
@@ -1,9 +1,9 @@
 <?php
     /**
-     * @file   addons/autolink/lang/ko.lang.php
+     * @file   addons/autolink/lang/ge.lang.php
      * @author zero (zero@zeroboard.com)
      * @brief  한국어 언어팩 (기본적인 내용만 수록)
      **/
-    $lang->open_cur_window = "현재창";
-    $lang->open_new_window = "새창";
+    $lang->open_cur_window = "aktuelle Fenster";
+    $lang->open_new_window = "neues Fenster";
 ?>
diff --git a/addons/autolink/lang/ru.lang.php b/addons/autolink/lang/ru.lang.php
index 8ede9189e..01a30764c 100644
--- a/addons/autolink/lang/ru.lang.php
+++ b/addons/autolink/lang/ru.lang.php
@@ -1,9 +1,9 @@
 <?php
     /**
-     * @file   addons/autolink/lang/ko.lang.php
+     * @file   addons/autolink/lang/ru.lang.php
      * @author zero (zero@zeroboard.com)
      * @brief  한국어 언어팩 (기본적인 내용만 수록)
      **/
-    $lang->open_cur_window = "현재창";
-    $lang->open_new_window = "새창";
+    $lang->open_cur_window = "текущем окне";
+    $lang->open_new_window = "Новое окно";
 ?>

From 97e597859796ae0219edd190687d7f6c89eab1d3 Mon Sep 17 00:00:00 2001
From: duvent <duvent@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Mon, 5 May 2008 08:24:55 +0000
Subject: [PATCH 079/111] =?UTF-8?q?=EC=9A=A9=EC=96=B4=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?:=20=EA=B4=80=EB=A6=AC(administration),=20=EC=8B=A0=EA=B3=A0(d?=
 =?UTF-8?q?=C3=A9claration),=20=EC=82=AD=EC=A0=9C(effacer),=20=EC=A0=84?=
 =?UTF-8?q?=EC=B2=B4(tout0?=
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@4175 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/fr.lang.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php
index 692712317..32012011b 100644
--- a/common/lang/fr.lang.php
+++ b/common/lang/fr.lang.php
@@ -8,11 +8,11 @@
     // 	verbes et mots de base decrivant des actions 
     $lang->cmd_write = 'Ecrire';
     $lang->cmd_reply = 'Répondre';
-    $lang->cmd_delete = 'Supprimer';
+    $lang->cmd_delete = 'Effacer';
     $lang->cmd_modify = 'Modifier';
     $lang->cmd_edit = 'Editer';
     $lang->cmd_view = 'Voir';
-    $lang->cmd_view_all = 'Voir Tous';
+    $lang->cmd_view_all = 'Voir tout';
     $lang->cmd_list = 'Liste';
     $lang->cmd_prev = 'Précédent';
     $lang->cmd_next = 'Suivant';
@@ -28,23 +28,23 @@
     $lang->cmd_back = 'Retourner';
     $lang->cmd_vote = 'Recommander';
     $lang->cmd_vote_down = 'Critiquer';
-    $lang->cmd_declare = 'Accuser';
-    $lang->cmd_cancel_declare = 'Annuler l\'Accusation';
-    $lang->cmd_declared_list = 'Liste de l\'Accusation';
+    $lang->cmd_declare = 'Déclarer';
+    $lang->cmd_cancel_declare = 'Annuler déclaration';
+    $lang->cmd_declared_list = 'Liste des déclarations';
     $lang->cmd_copy = 'Copier';
     $lang->cmd_move = 'Bouger';
     $lang->cmd_move_up = 'En haut';
     $lang->cmd_move_down = 'En bas';
     $lang->cmd_add_indent = 'Ajouter un Rentré';
     $lang->cmd_remove_indent = 'Enlever un Rentré';
-    $lang->cmd_management = 'Gérer';
+    $lang->cmd_management = 'Administrer';
     $lang->cmd_make = 'Créer';
     $lang->cmd_select = 'Choisir';
-    $lang->cmd_select_all = 'Choisir Tous';
-    $lang->cmd_unselect_all = 'Annuler Tous'; 
+    $lang->cmd_select_all = 'Choisir Tout';
+    $lang->cmd_unselect_all = 'Annuler Tout'; 
     $lang->cmd_reverse_all = 'Renverser la Sélection';    
-    $lang->cmd_close_all = 'Fermer Tous';
-    $lang->cmd_open_all = 'Ouvrir Tous';
+    $lang->cmd_close_all = 'Fermer Tout';
+    $lang->cmd_open_all = 'Ouvrir Tout';
     $lang->cmd_reload = 'Recharger';
     $lang->cmd_close = 'Fermer';
     $lang->cmd_open = 'Ouvrir';
@@ -101,7 +101,7 @@
     $lang->allow_trackback = 'Permettre Rétrolien';
     $lang->uploaded_file = 'Fichier Attaché';
     $lang->grant = 'Permission';
-    $lang->target = 'Cible';
+    $lang->target = 'Objet';
     $lang->total = 'Total';
     $lang->total_count = 'Somme';
     $lang->ipaddress = 'Addresse IP';

From c210ae817632e0b2c893dcf64cd1aaabf694bc8a Mon Sep 17 00:00:00 2001
From: duvent <duvent@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Mon, 5 May 2008 08:26:21 +0000
Subject: [PATCH 080/111] =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=9C=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EB=B2=88=EC=97=AD?=
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@4176 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/addon/lang/fr.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/addon/lang/fr.lang.php b/modules/addon/lang/fr.lang.php
index a3de0c5f5..f5d25fe5c 100644
--- a/modules/addon/lang/fr.lang.php
+++ b/modules/addon/lang/fr.lang.php
@@ -11,7 +11,7 @@
     $lang->addon_maker = 'L\'Auteur de la Compagnon';
     $lang->addon_history = 'L\'Histoire de la Compagnon';
 
-    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
+    $lang->about_addon_mid = "On peut choisir des objets dans lesquels la Compagnon soit utilisé.<br />(Tout sera choisi quand rien n'est choisi.)";
     $lang->about_addon = 'La Compagnon, c\'est pour contrôler les actions plutôt d\'imprimer des résultats de HTML.<br/>Par la Touche à Bascule des compagnons que vous voulez faire marcher ou arrêter, vous pouvez appliquer les fonctions très utiles à administrer votre site web.';
 ?>
 

From 81b0245721dab17b93960cbab2d04339f2ac4930 Mon Sep 17 00:00:00 2001
From: duvent <duvent@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Mon, 5 May 2008 09:05:07 +0000
Subject: [PATCH 081/111] =?UTF-8?q?=EC=9A=A9=EC=96=B4=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?:=EC=9E=90=EB=A3=8C=EC=8B=A4,=20=EC=A0=80=EC=9E=A5=EC=86=8C,=20?=
 =?UTF-8?q?=EC=8A=A4=ED=82=A8,=20=EC=82=AD=EC=A0=9C?=
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@4177 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/lang/fr.lang.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/admin/lang/fr.lang.php b/modules/admin/lang/fr.lang.php
index 1ec354f3e..e5efc28bb 100644
--- a/modules/admin/lang/fr.lang.php
+++ b/modules/admin/lang/fr.lang.php
@@ -12,7 +12,7 @@
         'service' => 'Modules de Service',
         'manager' => 'Modules Administratif',
         'utility' => 'Modules d\'Utilité',
-        'accessory' => 'Modules Additionnels',
+        'accessory' => 'Modules Accessoires',
         'base' => 'Modules par Défaut',
     );
 
@@ -23,8 +23,8 @@
     $lang->env_information = "Informations de l'Environnement";
     $lang->current_version = "Version Courante";
     $lang->current_path = "Chemin Installé";
-    $lang->released_version = "Version Dernière";
-    $lang->about_download_link = "Nouvelle version est disponible. Pour télécharger la version dernière, cliquez le lien.";
+    $lang->released_version = "Dernière Version";
+    $lang->about_download_link = "Nouvelle version est disponible. Pour télécharger la dernière version, cliquez le lien.";
     
     $lang->item_module = "Liste des Modules";
     $lang->item_addon  = "Liste des Compagnons";
@@ -35,14 +35,14 @@
     $lang->addon_name = "Nom de Compagnon";
     $lang->version = "Version";
     $lang->author = "Auteur";
-    $lang->table_count = "Tables";
+    $lang->table_count = "Nombres de Tables";
     $lang->installed_path = "Chemin Installé";
 
     $lang->cmd_shortcut_management = "Editer le Menu";
 
     $lang->msg_is_not_administrator = 'Administrateur seulement';
-    $lang->msg_manage_module_cannot_delete = 'On ne peut pas supprimer les raccourcis pour les modules, les compagnons, les mises en page ou les widgets';
-    $lang->msg_default_act_is_null = 'on ne peut pas enrégistrer les raccourci parce que les Actions Par Défaut de l\'Administrateur n\'est pas configuré';
+    $lang->msg_manage_module_cannot_delete = 'On ne peut pas effacer les raccourcis pour les modules, les compagnons, les mises en page ou les widgets';
+    $lang->msg_default_act_is_null = 'on ne peut pas enrégistrer les raccourcis parce que les Actions Par Défaut de l\'Administrateur ne sont pas établis';
 
     $lang->welcome_to_zeroboard_xe = 'Bienvenue sur la Page d\'Administration du Zeroboard XE';
     $lang->about_admin_page = "La Page d\'Administration est encore en train de développer,\nNous allons ajouter des contenus essentiels par accepter beauoup de bons suggestions pendant Béta Proche.";
@@ -54,20 +54,20 @@
     $lang->xe_user_links = array(
         'Site Web Officiel' => 'http://www.zeroboard.com',
         //'Site Web Beta Proche' => 'http://spring.zeroboard.com',
-        //'Rservoir des Modules' => 'http://www.zeroboard.com',
-        //'Rservoir des Compagnons' => 'http://www.zeroboard.com',
-        //'Rservoir des Widgets' => 'http://www.zeroboard.com',
-        //'Rservoir des Thme des Modules' => 'http://www.zeroboard.com',
-        //Rservoir des Thme des 'Widgets' => 'http://www.zeroboard.com',
-        //'Rservoir des Thme des Mises en Page' => 'http://www.zeroboard.com',
+        //'Conservation des Modules' => 'http://www.zeroboard.com',
+        //'Conservation des Compagnons' => 'http://www.zeroboard.com',
+        //'Conservation des Widgets' => 'http://www.zeroboard.com',
+        //'Conservation des Thèmes des Modules' => 'http://www.zeroboard.com',
+        //Conservation des Thèmes des 'Widgets' => 'http://www.zeroboard.com',
+        //'Conservation des Thèmes des Mises en Page' => 'http://www.zeroboard.com',
     );
 
     $lang->xe_developer_links = array(
         'Manuel' => 'http://www.zeroboard.com/manual',
         //"Forum pour les Dveloppeurs" => 'http://spring.zeroboard.com',
         'Traque des Issues' => 'http://trac.zeroboard.com',
-        'Réservoir de SVN' => 'http://svn.zeroboard.com',
-        'Document de Doxygen' => 'http://doc.zeroboard.com',
+        'Répertoir de SVN' => 'http://svn.zeroboard.com',
+        'Documents de Doxygen' => 'http://doc.zeroboard.com',
         'Documentation de PDF' => 'http://doc.zeroboard.com/zeroboard_xe.pdf',
     );
 
@@ -77,12 +77,12 @@
         'dispDocumentAdminList' => 'Arrangement des Articles',
         'dispCommentAdminList' => 'Arrangement des Commentaires',
         'dispFileAdminList' => 'Arrangement des Rattachements',
-        'dispPollAdminList' => 'Arrangement du Sondage',
+        'dispPollAdminList' => 'Arrangement des Enquêtes',
         'dispSpamfilterAdminConfig' => 'Arrangement du Filtre contre Pourriel',
         'dispCounterAdminIndex' => 'Journal de Compteur',
 
     );
 
     $lang->xe_license = 'Zeroboard XE s\'applique la GPL';
-    $lang->about_shortcut = 'Vous pouvez supprimer raccourci pour les modules qui sont enrgistrés sur le liste des modules utilisés fréquemment';
+    $lang->about_shortcut = 'Vous pouvez effacer les raccourcis pour les modules qui sont enrgistrés sur le liste des modules utilisés fréquemment';
 ?>

From 3c11afddb9cabff94c035e36d10426af62223adf Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 6 May 2008 01:33:01 +0000
Subject: [PATCH 082/111] =?UTF-8?q?#468=20=EA=B4=80=EB=A0=A8=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EC=8A=A4=ED=82=A8=20group=20=ED=83=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EC=A7=80=EC=9B=90=20r4168=20=EC=9C=84=EC=A0=AF=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=97=90=EC=84=9C=20=EC=9E=98=EB=AA=BB=20=EC=A7=80?=
 =?UTF-8?q?=EC=A0=95=EB=90=9C=20=EC=BB=AC=EB=9F=BC=20=ED=81=AC=EA=B8=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
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@4178 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/board.admin.view.php           |  1 +
 modules/board/tpl/skin_info.html             | 18 +++++
 modules/module/module.model.php              | 69 +++++++++++---------
 modules/widget/tpl/widget_generate_code.html |  4 +-
 4 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/modules/board/board.admin.view.php b/modules/board/board.admin.view.php
index bbf983516..a909b252c 100644
--- a/modules/board/board.admin.view.php
+++ b/modules/board/board.admin.view.php
@@ -171,6 +171,7 @@
             // skin_info에 extra_vars 값을 지정
             if(count($skin_info->extra_vars)) {
                 foreach($skin_info->extra_vars as $key => $val) {
+                    $group = $val->group;
                     $name = $val->name;
                     $type = $val->type;
                     $value = $module_info->{$name};
diff --git a/modules/board/tpl/skin_info.html b/modules/board/tpl/skin_info.html
index 654262ac1..59cc575de 100644
--- a/modules/board/tpl/skin_info.html
+++ b/modules/board/tpl/skin_info.html
@@ -59,6 +59,16 @@
     </tr>
 
     <!--@foreach($skin_info->extra_vars as $key => $val)-->
+
+    <!--@if($val->group && ((!$group) || $group != $val->group))-->
+    {@$group = $val->group}
+    </table>
+    <table cellspacing="0" class="adminTable">
+    <col width="150" />
+    <col />
+    <caption>{$group}</caption>
+    <!--@end-->
+
     <tr>
         <th scope="row">{$val->title}</th>
         <td class="left">
@@ -110,6 +120,14 @@
         </td>
     </tr>
     <!--@end-->
+
+    <!--@if($group)-->
+    </table>
+    <table cellspacing="0" class="adminTable">
+    <col width="150" />
+    <col />
+    <!--@end-->
+
     <tr>
         <th scope="row" colspan="2" class="button">
             <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 20228fb20..aab2816fe 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -263,41 +263,50 @@
             }
 
             // 스킨에서 사용되는 변수들
-            $extra_vars = $xml_obj->extra_vars->var;
-            if($extra_vars) {
-                
-                if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+            $extra_var_groups = $xml_obj->extra_vars->group;
+            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
-                foreach($extra_vars as $var) {
-                    unset($obj);
+            foreach($extra_var_groups as $group){
+                $extra_vars = $group->var;
 
-                    $name = $var->attrs->name;
-                    $type = $var->attrs->type;
-                    $title = $var->title->body;
-                    $description = $var->description->body;
+                if($extra_vars) {
 
-                    if($var->default) {
-                        unset($default);
-                        if(is_array($var->default)) {
-                            for($i=0;$i<count($var->default);$i++) $default[] = $var->default[$i]->body;
-                        } else {
-                            $default = $var->default->body;
+                    if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+
+                    foreach($extra_vars as $var) {
+                        unset($obj);
+
+                        $group = $group->title->body;
+                        $name = $var->attrs->name;
+                        $type = $var->attrs->type;
+                        $title = $var->title->body;
+                        $description = $var->description->body;
+
+                        if($var->default) {
+                            unset($default);
+                            if(is_array($var->default)) {
+                                for($i=0;$i<count($var->default);$i++) $default[] = $var->default[$i]->body;
+                            } else {
+                                $default = $var->default->body;
+                            }
                         }
+
+                        $width = $var->attrs->width;
+                        $height = $var->attrs->height;
+
+                        unset($obj);
+                        $obj->group = $group;
+                        $obj->title = $title;
+                        $obj->description = $description;
+                        $obj->name = $name;
+                        $obj->type = $type;
+                        $obj->default = $default;
+                        $obj->width = $width;
+                        $obj->height = $height;
+
+                        $skin_info->extra_vars[] = $obj;
                     }
-
-                    $width = $var->attrs->width;
-                    $height = $var->attrs->height;
-
-                    unset($obj);
-                    $obj->title = $title;
-                    $obj->description = $description;
-                    $obj->name = $name;
-                    $obj->type = $type;
-                    $obj->default = $default;
-                    $obj->width = $width;
-                    $obj->height = $height;
-
-                    $skin_info->extra_vars[] = $obj;
                 }
             }
 
diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html
index a5d9bac01..88d0d2cd4 100644
--- a/modules/widget/tpl/widget_generate_code.html
+++ b/modules/widget/tpl/widget_generate_code.html
@@ -53,7 +53,7 @@
         {@$group = $var->group}
         </table>
         <table cellspacing="0" class="adminTable">
-        <col width="150" />
+        <col width="100" />
         <col width="*" />
         <caption>{$group}</caption>
         <!--@end-->
@@ -104,7 +104,7 @@
         <!--@if($group)-->
         </table>
         <table cellspacing="0" class="adminTable">
-        <col width="150" />
+        <col width="100" />
         <col width="*" />
         <!--@end-->
 

From 827aa8ab492d9814aa2908c3338288644397890a Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 6 May 2008 02:57:11 +0000
Subject: [PATCH 083/111] =?UTF-8?q?=EB=B2=88=ED=98=B8=EA=B0=80=20=EC=9E=98?=
 =?UTF-8?q?=EB=AA=BB=20=EC=A0=81=ED=9E=8C=20=EA=B2=83=EC=9D=84=20=EB=B0=94?=
 =?UTF-8?q?=EB=A5=B4=EA=B2=8C=20=EA=B3=A0=EC=B9=A8.=20(1-1-2-3-4=EB=A1=9C?=
 =?UTF-8?q?=20=EB=90=9C=20=EA=B2=83=EC=9D=84=201-2-3-4-5=EB=A1=9C)?=
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@4179 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/importer/tpl/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html
index 9e507c8b2..cb7b87be6 100644
--- a/modules/importer/tpl/index.html
+++ b/modules/importer/tpl/index.html
@@ -20,19 +20,19 @@
             <td class="left"><input type="radio" name="source_type" value="module" id="source_type_module" /> <label for="source_type_module">{$lang->about_type_module}</label></td>
         </tr>
         <tr>
-            <th scope="col"><label for="source_type_ttxml">1. {$lang->type_ttxml}</label></th>
+            <th scope="col"><label for="source_type_ttxml">2. {$lang->type_ttxml}</label></th>
             <td class="left"><input type="radio" name="source_type" value="ttxml" id="source_type_ttxml" /> <label for="source_type_ttxml">{$lang->about_type_ttxml}</label></td>
         </tr>
         <tr>
-            <th scope="col"><label for="source_type_member">2. {$lang->type_member}</label></th>
+            <th scope="col"><label for="source_type_member">3. {$lang->type_member}</label></th>
             <td class="left"><input type="radio" name="source_type" value="member" id="source_type_member" /> <label for="source_type_member">{$lang->about_type_member}</label></td>
         </tr>
         <tr>
-            <th scope="col"><label for="source_type_syncmember">3. {$lang->type_syncmember}</label></th>
+            <th scope="col"><label for="source_type_syncmember">4. {$lang->type_syncmember}</label></th>
             <td class="left"><input type="radio" name="source_type" value="sync" id="source_type_syncmember" /> <label for="source_type_syncmember">{$lang->about_type_syncmember}</label></td>
         </tr>
         <tr>
-            <th scope="col"><label for="source_type_message">4. {$lang->type_message}</label></th>
+            <th scope="col"><label for="source_type_message">5. {$lang->type_message}</label></th>
             <td class="left"><input type="radio" name="source_type" value="message" id="source_type_message" /> <label for="source_type_message">{$lang->about_type_message}</label></td>
         </tr>
         <tr>

From ed57865f974ba0f2a6c86909ed4dc55bcb8e4879 Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 6 May 2008 14:41:42 +0000
Subject: [PATCH 084/111] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@4181
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 layouts/xe_blog/conf/info.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/layouts/xe_blog/conf/info.xml b/layouts/xe_blog/conf/info.xml
index 358b10679..2d2bc8665 100644
--- a/layouts/xe_blog/conf/info.xml
+++ b/layouts/xe_blog/conf/info.xml
@@ -4,6 +4,7 @@
     <title xml:lang="jp">ZBXEブログのデフォルトスキン</title>
     <title xml:lang="zh-CN">Zeroboard XE博客默认皮肤</title>
     <title xml:lang="en">Default Skin of Zeroboard XE blog</title>
+	<title xml:lang="ge">Standard-Skin von Zeroboard XE Blog</title>
 	<title xml:lang="es">Cuidado de la Piel por defecto de Zeroboard XE blog</title>
 	<title xml:lang="ru">По умолчанию Кожа Zeroboard XE блоге</title>
     <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 2. 26">
@@ -11,6 +12,7 @@
         <name xml:lang="jp">zero</name>
         <name xml:lang="zh-CN">zero</name>
         <name xml:lang="en">zero</name>
+	    <name xml:lang="ge">zero</name>
 		<name xml:lang="es">zero</name>
 		<name xml:lang="ru">zero</name>
         <description xml:lang="ko">
@@ -32,6 +34,11 @@
             This is default skin of Zeroboard XE blog.
             Design : Ki-Jeong Seo (http://blog.naver.com/addcozy)
             HTML/CSS : Ju-Hoon So
+        </description>
+		<description xml:lang="ge">
+            Dies ist der Standard-Skin Zeroboard XE-Blog.
+             Design: Ki-Seo Jeong (http://blog.naver.com/addcozy)
+             HTML / CSS: Ju-Hoon Also
         </description>
 		<description xml:lang="es">
             Esto es por defecto de la piel Zeroboard XE blog.
@@ -50,12 +57,14 @@
             <title xml:lang="jp">カラーセット</title>
             <title xml:lang="zh-CN">颜色</title>
             <title xml:lang="en">Colorset</title>
+			<title xml:lang="ge">Colorset</title>
             <title xml:lang="es">Set de Colores</title>
 			<title xml:lang="ru">Colorset</title>
             <description xml:lang="ko">원하시는 컬러셋을 선택해주세요.</description>
             <description xml:lang="jp">希望するカラーセットを選択してください。</description>
             <description xml:lang="zh-CN">请选择颜色。</description>
             <description xml:lang="en">Please select a colorset you want.</description>
+			<description xml:lang="ge">Bitte wählen Sie ein colorset Sie wollen.</description>
 			<description xml:lang="ru">Выберите colorset хотите.</description>
             <description xml:lang="es">Seleccione set de colores que desea.</description>
             <options name="blue">
@@ -63,6 +72,7 @@
                 <title xml:lang="jp">青 (default)</title>
                 <title xml:lang="zh-CN">蓝色 (default)</title>
                 <title xml:lang="en">Blue (default)</title>
+				<title xml:lang="ge">Blue (Standard)</title>
                 <title xml:lang="es">Azul (default)</title>
                 <title xml:lang="ru">Blue (default)</title>
                 <value>blue</value>
@@ -72,6 +82,7 @@
                 <title xml:lang="jp">灰色背景</title>
                 <title xml:lang="zh-CN">灰色背景</title>
                 <title xml:lang="en">Gray</title>
+				<title xml:lang="ge">Gray</title>
                 <title xml:lang="es">Gray</title>
                 <title xml:lang="ru">Gray</title>
                 <value>gray</value>
@@ -81,6 +92,7 @@
                 <title xml:lang="jp">Orange</title>
                 <title xml:lang="zh-CN">Orange</title>
                 <title xml:lang="en">Orange</title>
+				<title xml:lang="ge">Orange</title>
 				<title xml:lang="es">Orange</title>
 				<title xml:lang="ru">Orange</title>
                 <value>orange</value>
@@ -90,6 +102,7 @@
                 <title xml:lang="jp">Violet</title>
                 <title xml:lang="zh-CN">Violet</title>
                 <title xml:lang="en">Violet</title>
+				<title xml:lang="ge">Violett</title>
 				<title xml:lang="es">Violet</title>
 				<title xml:lang="ru">Violet</title>
                 <value>violet</value>
@@ -99,6 +112,7 @@
                 <title xml:lang="jp">緑</title>
                 <title xml:lang="zh-CN">绿色</title>
                 <title xml:lang="en">Green</title>
+				<title xml:lang="ge">Grün</title>
 				<title xml:lang="es">Verde</title>
 				<title xml:lang="ru">Green</title>
                 <value>green</value>
@@ -109,12 +123,14 @@
             <title xml:lang="jp">기본 모듈</title>
             <title xml:lang="zh-CN">기본 모듈</title>
             <title xml:lang="en">Basic module</title>
+			<title xml:lang="ge">Basismodul</title>
 			<title xml:lang="es">Módulo Básico</title>
 			<title xml:lang="ru">Основной модуль</title>
             <description xml:lang="ko">기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다</description>
             <description xml:lang="jp">기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다</description>
             <description xml:lang="zh-CN">기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다</description>
             <description xml:lang="en">The widgets that are being displayed in the layout will work properly if you select the basic module</description>
+			<description xml:lang="ge">Die Widgets, die angezeigt werden im Layout wird ordnungsgemäß funktionieren, wenn Sie das Basismodul</description>
 			<description xml:lang="es">Los reproductores que se muestran en el diseño funcionará correctamente si selecciona el módulo básico</description>
 			<description xml:lang="ru">В виджеты, которые отображаются в формате будет работать правильно, если вы выбираете основной модуль</description>
         </var>
@@ -129,6 +145,7 @@
             <description xml:lang="jp">背景イメージを使う場合は、登録してください。</description>
             <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
             <description xml:lang="en">Please input if you want to use background image.</description>
+			<description xml:lang="ge">Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild.</description>
 			<description xml:lang="es">Entre, por favor, si desea utilizar la imagen de fondo.</description>
 			<description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
         </var>
@@ -137,12 +154,14 @@
             <title xml:lang="jp">プロフィールイメージ</title>
             <title xml:lang="zh-CN">博客个性图片</title>
             <title xml:lang="en">Profile Image</title>
+			<title xml:lang="ge">Profil Bilder</title>
 			<title xml:lang="es">Perfil de Imagen</title>
 			<title xml:lang="ru">Профиль Изображение</title>
             <description xml:lang="ko">프로필 이미지를 입력해 주세요 (가로 사이즈는 160px이 가장 보기 좋습니다)</description>
             <description xml:lang="jp">プロフィールイメージを入力してください（横幅は「160px」が一番適しています）。</description>
             <description xml:lang="zh-CN">请输入博客个性图片(推荐宽度160px)。</description>
             <description xml:lang="en">Please input profile image (It is recommended to set width as 160px)</description>
+			<description xml:lang="ge">itte geben Sie Ihre Image-Profil (Es wird empfohlen, Breite 160px)</description>
 			<description xml:lang="es">Por favor, el perfil de entrada de imagen (Se recomienda configurar el ancho de 160px)</description>
 			<description xml:lang="ru">Введите профиля изображения (Рекомендуется устанавливать ширину, 160px)</description>
         </var>
@@ -151,12 +170,14 @@
             <title xml:lang="jp">プロフィール</title>
             <title xml:lang="zh-CN">简介</title>
             <title xml:lang="en">Profile</title>
+			<title xml:lang="ge">Profil</title>
 			<title xml:lang="es">Perfil</title>
 			<title xml:lang="ru">Профиль</title>
             <description lang="ko">간단한 프로필을 입력해주세요</description>
             <description lang="jp">簡単なプロフィールを入力してください。</description>
             <description lang="zh-CN">请输入简单介绍。</description>
             <description lang="en">Please input your simple profile</description>
+			<description lang="ge">Bitte geben Sie Ihre Simple Profile</description>
 			<description lang="es">Por favor, introduzca su perfil simple</description>
 			<description lang="ru">Введите простое профиль</description>
         </var>
@@ -167,6 +188,7 @@
             <title xml:lang="jp">上段メニュー</title>
             <title xml:lang="zh-CN">菜单</title>
             <title xml:lang="en">Top Menu</title>
+			<title xml:lang="ge">Top-Menü</title>
 			<title xml:lang="es">Menú superior</title>
 			<title xml:lang="ru">Главное меню</title>
             <maxdepth>1</maxdepth>

From 9a1830ce6782ddc6ca3475061932ba3e3655dd1f Mon Sep 17 00:00:00 2001
From: clench <clench@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 7 May 2008 02:35:42 +0000
Subject: [PATCH 085/111] =?UTF-8?q?FireBird=20Handler=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@4183 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/db/DBFirebird.class.php         | 918 ++++++++++++++++++++++++
 modules/install/tpl/filter/firebird.xml |  38 +
 modules/install/tpl/form.firebird.html  |  51 ++
 3 files changed, 1007 insertions(+)
 create mode 100644 classes/db/DBFirebird.class.php
 create mode 100644 modules/install/tpl/filter/firebird.xml
 create mode 100644 modules/install/tpl/form.firebird.html

diff --git a/classes/db/DBFirebird.class.php b/classes/db/DBFirebird.class.php
new file mode 100644
index 000000000..12b5ef476
--- /dev/null
+++ b/classes/db/DBFirebird.class.php
@@ -0,0 +1,918 @@
+<?php
+    /**
+     * @class DBFriebird
+     * @author 김현식 (dev.hyuns@gmail.com)
+     * @brief Firebird DBMS를 이용하기 위한 class
+     * @version 0.3
+     *
+     * firebird handling class
+     **/
+
+    class DBFireBird extends DB {
+
+        /**
+         * @brief Firebird DB에 접속하기 위한 정보
+         **/
+        var $hostname = '127.0.0.1'; ///< hostname
+        var $userid   = NULL; ///< user id
+        var $password   = NULL; ///< password
+        var $database = NULL; ///< database
+        var $prefix   = 'xe'; ///< 제로보드에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 제로보드 설치 가능)
+
+        /**
+         * @brief firebird에서 사용될 column type
+         *
+         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
+         * 각 DBMS에 맞게 replace 해주어야 한다
+         **/
+        var $column_type = array(
+            'bignumber' => 'BIGINT',
+            'number' => 'INTEGER',
+            'varchar' => 'VARCHAR',
+            'char' => 'CHAR',
+            'text' => 'BLOB SUB_TYPE TEXT SEGMENT SIZE 20',
+            'bigtext' => 'BLOB SUB_TYPE TEXT SEGMENT SIZE 20',
+            'date' => 'VARCHAR(14)',
+        );
+
+        /**
+         * @brief constructor
+         **/
+        function DBFireBird() {
+            $this->_setDBInfo();
+            $this->_connect();
+        }
+
+        /**
+         * @brief 설치 가능 여부를 return
+         **/
+        function isSupported() {
+            if(!function_exists('ibase_connect')) return false;
+            return true;
+        }
+
+        /**
+         * @brief DB정보 설정 및 connect/ close
+         **/
+        function _setDBInfo() {
+            $db_info = Context::getDBInfo();
+            $this->hostname = $db_info->db_hostname;
+            $this->port = $db_info->db_port;
+            $this->userid   = $db_info->db_userid;
+            $this->password   = $db_info->db_password;
+            $this->database = $db_info->db_database;
+            $this->prefix = $db_info->db_table_prefix;
+            if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
+        }
+
+        /**
+         * @brief DB 접속
+         **/
+        function _connect() {
+            // db 정보가 없으면 무시
+            if(!$this->hostname || !$this->userid || !$this->password || !$this->database) return;
+
+            //if(strpos($this->hostname, ':')===false && $this->port) $this->hostname .= ':'.$this->port;
+
+            // 접속시도
+
+            $host = $this->hostname.":".$this->database;
+
+            $this->fd = @ibase_connect($host, $this->userid, $this->password);
+            if(ibase_errmsg()) {
+                $this->setError(ibase_errcode(), ibase_errmsg());
+                return;
+            }
+
+            // Firebird 버전 확인후 2.0 이하면 오류 표시
+            if (($service = ibase_service_attach($this->hostname, $this->userid, $this->password)) != FALSE) {
+                // get server version and implementation strings
+                $server_info  = ibase_server_info($service, IBASE_SVC_SERVER_VERSION);
+                ibase_service_detach($service);
+            }    
+            else {
+                $this->setError(ibase_errcode(), ibase_errmsg());
+                return;
+            }
+
+            $pos = strpos($server_info, "Firebird");
+            if($pos !== false) {
+                $ver = substr($server_info, $pos+strlen("Firebird"));
+                $ver = trim($ver);
+            }
+
+            if($ver < "2.0") {
+                $this->setError(-1, "Zeroboard XE cannot be installed under the version of firebird 2.0. Current firebird version is ".$ver);
+                return;
+            }
+
+            // 접속체크
+            $this->is_connected = true;
+        }
+
+        /**
+         * @brief DB접속 해제
+         **/
+        function close() {
+            if(!$this->isConnected()) return;
+            ibase_close($this->fd);
+        }
+
+        /**
+         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
+         **/
+        function addQuotes($string) {
+//            if(get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+//            if(!is_numeric($string)) $string = str_replace("'","''", $string);
+            return $string;
+        }
+
+        /**
+        * @brief 쿼리에서 입력되는 table, column 명에 더블쿼터를 넣어줌
+        **/
+        function addDoubleQuotes($string) {
+            if($string == "*") return $string;
+
+            if(strpos($string, "'")!==false) {
+                $string = str_replace("'", "\"", $string);
+            }
+            else if(strpos($string, "\"")!==false) {
+            }
+            else {
+                $string = "\"".$string."\"";
+            }
+
+            return $string;
+        }
+
+        /**
+         * @brief 쿼리에서 입력되는 table, column 명에 더블쿼터를 넣어줌
+         **/
+        function autoQuotes($string){
+            $string = strtolower($string);
+
+            // substr 함수 일경우
+            if(strpos($string, "substr(") !== false) {
+                $tokken = strtok($string, "(,)");
+                $tokken = strtok("(,)");
+                while($tokken) {
+                    $tokkens[] = $tokken;
+                    $tokken = strtok("(,)");
+                }
+
+                if(count($tokkens) !== 3) return $string;
+                return sprintf("substring(%s from %s for %s)", $this->addDoubleQuotes($tokkens[0]), $tokkens[1], $tokkens[2]);
+            }
+
+            // as
+            $as = false;
+            if(($no1 = strpos($string," as ")) !== false) {
+                $as = substr($string, $no1, strlen($string)-$no1);
+                $string = substr($string, 0, $no1);
+
+                $as = str_replace(" as ", "", $as);
+                $as = trim($as);
+                $as = $this->addDoubleQuotes($as);
+            }
+
+            // 함수 사용시
+            if(($no1 = strpos($string,'('))!==false && ($no2 = strpos($string, ')'))!==false) {
+                $tmpString1 = substr($string, 0, $no1+1);
+                $tmpString2 = substr($string, $no1+1, $no2-$no1-1);
+                $tmpString3 = substr($string, $no2, strlen($string)-$no2+1);
+
+                $tmpString2 = trim($tmpString2);
+
+                if($tmpString2 != "*") $tmpString2 = $this->addDoubleQuotes($tmpString2);
+
+                $string = $tmpString1.$tmpString2.$tmpString3;
+            }
+            // 테이블.필드
+            else if(($no1 = strpos($string,'.'))!==false) {
+                $tmpString1 = substr($string, 0, $no1); // table
+                $tmpString2 = substr($string, $no1+1, strlen($string)-$no1+1); // field
+
+                $tmpString1 = trim($tmpString1);
+                $tmpString2 = trim($tmpString2);
+
+                $tmpString1 = $this->addDoubleQuotes($tmpString1);
+                if($tmpString2 != "*") $tmpString2 = $this->addDoubleQuotes($tmpString2);
+
+                $string = $tmpString1.".".$tmpString2;
+
+            }
+            else {
+                $string = $this->addDoubleQuotes($string);
+            }
+
+            if($as !== false) $string = $string." as ".$as;
+            return $string;
+        }
+
+        function autoValueQuotes($string, $output){
+            $tok = strtok($string, ",");
+            while($tok !== false) {
+                $values[] = $tok;
+                $tok = strtok(",");
+            }
+
+            foreach($values as $val) {
+                if(($no1 = strpos($val,'.'))!==false) {
+                    $tmpString1 = substr($val, 0, $no1); // table
+                    $tmpString2 = substr($val, $no1+1, strlen($val)-$no1+1); // field
+
+                    $tmpString1 = trim($tmpString1);
+                    $tmpString2 = trim($tmpString2);
+
+                    $isTable = false;
+                    foreach($output->tables as $key => $val) {
+                        if($key == $tmpString1) $isTable = true;
+                    }
+
+                    if($isTable) {
+                        $tmpString1 = $this->addDoubleQuotes($tmpString1);
+                        if($tmpString2 != "*") $tmpString2 = $this->addDoubleQuotes($tmpString2);
+                        $return[] = $tmpString1.".".$tmpString2;
+                    }
+                    else {
+                        $return[] = $tmpString1.".".$tmpString2;
+                    }
+                }
+                else if(!is_numeric($val)) {
+                    if(strpos($val, "'") !== 0)
+                        $return[] = "'".$val."'";
+                    else
+                        $return[] = $val;
+                }
+                else {
+                    $return[] = $val;
+                }
+            }
+
+            return implode(",", $return);
+        }
+
+        /**
+         * @brief 트랜잭션 시작
+         **/
+        function begin() {
+        }
+
+        /**
+         * @brief 롤백
+         **/
+        function rollback() {
+            //@ibase_rollback($this->fd);
+        }
+
+        /**
+         * @brief 커밋
+         **/
+        function commit() {
+            //@ibase_commit($this->fd);
+        }
+
+        /**
+         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
+         *
+         * query : query문 실행하고 result return\n
+         * fetch : reutrn 된 값이 없으면 NULL\n
+         *         rows이면 array object\n
+         *         row이면 object\n
+         *         return\n
+         **/
+        function _query($query, $params=null) {
+            if(!$this->isConnected()) return;
+
+            if(count($params) == 0) {
+                // 쿼리 시작을 알림
+                $this->actStart($query);
+
+                // 쿼리 문 실행
+                 $result = ibase_query($this->fd, $query);
+            }
+            else {
+                // 쿼리 시작을 알림
+                $log = $query."\n\t\t\t";
+                $log .= implode(",", $params);
+                $this->actStart($log);
+
+                // 쿼리 문 실행 (blob type 입력하기 위한 방법)
+                $query = ibase_prepare($this->fd, $query);
+                $fnarr = array_merge(array($query), $params);
+                $result = call_user_func_array("ibase_execute", $fnarr);
+            }
+
+            // 오류 체크
+            if(ibase_errmsg()) $this->setError(ibase_errcode(), ibase_errmsg());
+
+            // 쿼리 실행 종료를 알림
+            $this->actFinish();
+
+            // 결과 리턴
+            return $result;
+        }
+
+        /**
+         * @brief 결과를 fetch
+         **/
+        function _fetch($result, $output) {
+            if(!$this->isConnected() || $this->isError() || !$result) return;
+
+            while($tmp = ibase_fetch_object($result)) {
+                foreach($tmp as $key => $val) {
+                    $type = $output->column_type[$key];
+
+                    if($type == "text" || $type == "bigtext") {
+                        $blob_data = ibase_blob_info($tmp->{$key});
+                        $blob_hndl = ibase_blob_open($tmp->{$key});
+                        $tmp->{$key} = ibase_blob_get($blob_hndl, $blob_data[0]);
+                        ibase_blob_close($blob_hndl);
+                    }
+                }
+
+                $return[] = $tmp;
+            }
+
+            if(count($return)==1) return $return[0];
+            return $return;
+        }
+
+        /**
+         * @brief 1씩 증가되는 sequence값을 return (firebird의 generator 값을 증가)
+         **/
+        function getNextSequence() { 
+            $gen = "GEN_".$this->prefix."sequence_ID";
+            $sequence = ibase_gen_id($gen, 1);
+            return $sequence;
+        }
+
+        /**
+         * @brief 테이블 기생성 여부 return
+         **/
+        function isTableExists($target_name) {
+            $query = sprintf("select rdb\$relation_name from rdb\$relations where rdb\$system_flag=0 and rdb\$relation_name = '%s%s';", $this->prefix, $target_name);
+            $result = $this->_query($query);
+            $tmp = $this->_fetch($result);
+            if(!$tmp)
+            {
+                @ibase_rollback($this->fd);
+                return false;
+            }
+            //commit();
+            @ibase_commit($this->fd);
+            return true;
+        }
+
+        /**
+         * @brief 특정 테이블에 특정 column 추가
+         **/
+        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
+            $type = $this->column_type[$type];
+            if(strtoupper($type)=='INTEGER') $size = '';
+
+            $query = sprintf("ALTER TABLE \"%s%s\" ADD \"%s\" ", $this->prefix, $table_name, $column_name);
+            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
+            else $query .= sprintf(" %s ", $type);
+            if($default) $query .= sprintf(" DEFAULT '%s' ", $default);
+            if($notnull) $query .= " NOT NULL ";
+
+            $this->_query($query);
+            //commit();
+            @ibase_commit($this->fd);
+        }
+
+
+        /**
+         * @brief 특정 테이블의 column의 정보를 return
+         **/
+        function isColumnExists($table_name, $column_name) {
+            $query = sprintf("SELECT RDB\$FIELD_NAME as \"FIELD\" FROM RDB\$RELATION_FIELDS WHERE RDB\$RELATION_NAME = '%s%s'", $this->prefix, $table_name);
+            $result = $this->_query($query);
+            if($this->isError()) return;
+            $output = $this->_fetch($result);
+            //commit();
+            @ibase_commit($this->fd);
+
+            if($output) {
+                $column_name = strtolower($column_name);
+                foreach($output as $key => $val) {
+                    $name = trim(strtolower($val->FIELD));
+                    if($column_name == $name) return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * @brief 특정 테이블에 특정 인덱스 추가
+         * $target_columns = array(col1, col2)
+         * $is_unique? unique : none
+         **/
+        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
+            if(!is_array($target_columns)) $target_columns = array($target_columns);
+
+            $query = sprintf('CREATE %s INDEX "%s" ON "%s%s" ("%s");', $is_unique?'UNIQUE':'', $index_name, $this->prefix, $table_name, implode('", "',$target_columns));
+            $this->_query($query);
+            //commit();
+            @ibase_commit($this->fd);
+        }
+
+        /**
+         * @brief 특정 테이블의 index 정보를 return
+         **/
+        function isIndexExists($table_name, $index_name) {
+            $query = "SELECT\n";
+            $query .= "   RDB\$INDICES.rdb\$index_name AS Key_name\n";
+            $query .= "FROM\n";
+            $query .= "   RDB\$INDICES, rdb\$index_segments\n";
+            $query .= "WHERE\n";
+            $query .= "   RDB\$INDICES.rdb\$index_name =  rdb\$index_segments.rdb\$index_name AND\n";
+            $query .= "   RDB\$INDICES.rdb\$relation_name = '";
+            $query .= $this->prefix;
+            $query .= $table_name;
+            $query .= "' AND\n";
+            $query .= "   RDB\$INDICES.rdb\$index_name = '";
+            $query .= $index_name;
+            $query .= "'";
+
+            $result = $this->_query($query);
+            if($this->isError()) return;
+            $output = $this->_fetch($result);
+            //commit();
+            @ibase_commit($this->fd);
+
+            for($i=0;$i<count($output);$i++) {
+                if(trim($output[$i]->KEY_NAME) == $index_name) return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * @brief xml 을 받아서 테이블을 생성
+         **/
+        function createTableByXml($xml_doc) {
+            return $this->_createTable($xml_doc);
+        }
+
+        /**
+         * @brief xml 을 받아서 테이블을 생성
+         **/
+        function createTableByXmlFile($file_name) {
+            if(!file_exists($file_name)) return;
+            // xml 파일을 읽음
+            $buff = FileHandler::readFile($file_name);
+            return $this->_createTable($buff);
+        }
+
+        /**
+         * @brief schema xml을 이용하여 create table query생성
+         *
+         * type : number, varchar, text, char, date, \n
+         * opt : notnull, default, size\n
+         * index : primary key, index, unique\n
+         **/
+        function _createTable($xml_doc) {
+            // xml parsing
+            $oXml = new XmlParser();
+            $xml_obj = $oXml->parse($xml_doc);
+
+            // 테이블 생성 schema 작성
+            $table_name = $xml_obj->table->attrs->name;
+            if($this->isTableExists($table_name)) return;
+            $table_name = $this->prefix.$table_name;
+
+            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
+            else $columns = $xml_obj->table->column;
+
+            foreach($columns as $column) {
+                $name = $column->attrs->name;
+                $type = $column->attrs->type;
+                $size = $column->attrs->size;
+                $notnull = $column->attrs->notnull;
+                $primary_key = $column->attrs->primary_key;
+                $index = $column->attrs->index;
+                $unique = $column->attrs->unique;
+                $default = $column->attrs->default;
+                $auto_increment = $column->attrs->auto_increment;
+
+                if($this->column_type[$type]=='INTEGER') $size = null;
+                else if($this->column_type[$type]=='VARCHAR' && !$size) $size = 256;
+             	
+                $column_schema[] = sprintf('"%s" %s%s %s %s',
+                    $name,
+                    $this->column_type[$type],
+                    $size?'('.$size.')':'',
+                    $default?"DEFAULT '".$default."'":"",
+                    $notnull?'NOT NULL':'');
+
+                if($auto_increment) $auto_increment_list[] = $name;
+
+                if($primary_key) $primary_list[] = $name;
+                else if($unique) $unique_list[$unique][] = $name;
+                else if($index) $index_list[$index][] = $name;
+            }
+
+            if(count($primary_list)) {
+                $column_schema[] = sprintf("PRIMARY KEY(\"%s\")%s", implode("\",\"", $primary_list), "\n");
+            }
+
+            if(count($unique_list)) {
+                foreach($unique_list as $key => $val) {
+                    $column_schema[] = sprintf("UNIQUE(\"%s\")%s", implode("\",\"", $val), "\n");
+                }
+            }
+
+            $schema = sprintf("CREATE TABLE \"%s\" (%s%s); \n", $table_name, "\n", implode($column_schema, ",\n"));
+
+            $output = $this->_query($schema);
+            //commit();
+            @ibase_commit($this->fd);
+            if(!$output) return false;
+           
+            if(count($index_list)) { 
+                foreach($index_list as $key => $val) {
+                    // index name = prefix  + table name + index_list
+                    // index name 크기가 31byte로 제한되어 있어 중복되지 않을만큼 테이블명을 줄임
+                    // prefix name을 2byte 보다 크게 할 경우 31byte를 넘는 index name이 생김
+                    // 더 좋은 방법을 찾아봐야겠음.
+                    $tok = strtok($table_name, "_");
+                    $index_name = $this->prefix;
+                    $tok = strtok("_");
+                    $index_name .= substr($tok, 0, 2);
+                    $index_name .= substr($tok, -1, 1);
+                    $tok = strtok("_");
+                    while($tok !== false) {
+                        $index_name .= substr($tok, 0, 1);
+                        $tok = strtok("_");
+                    }
+
+
+                    $schema = sprintf("CREATE INDEX \"%s_%s\" ON \"%s\" (\"%s\");",
+                            $index_name, $key, $table_name, implode($val, "\",\""));
+                    $output = $this->_query($schema);
+                    //commit();
+                    @ibase_commit($this->fd);
+                    if(!$output) return false;
+                }
+            }
+            
+            foreach($auto_increment_list as $increment) {
+                $schema = sprintf('CREATE GENERATOR GEN_%s_ID;', $table_name);
+                $output = $this->_query($schema);
+                @ibase_commit($this->fd);
+                if(!$output) return false;
+
+                // Firebird에서 auto increment는 generator를 만들어 insert 발생시 트리거를 실행시켜
+                // generator의 값을 증가시키고 그값을 테이블에 넣어주는 방식을 사용함.
+                // 아래 트리거가 auto increment 역할을 하지만 쿼리로 트리거 등록이 되지 않아 주석처리 하였음.
+                // php 함수에서 generator 값을 증가시켜 주는 함수가 있어 제로보드에서는 굳이
+                // auto increment를 사용 할 필요가 없어보임.
+                /*
+                $schema = 'SET TERM ^ ; ';
+                $schema .= sprintf('CREATE TRIGGER "%s_BI" FOR "%s" ', $table_name, $table_name);
+                $schema .= 'ACTIVE BEFORE INSERT POSITION 0 ';
+                $schema .= sprintf('AS BEGIN IF (NEW."%s" IS NULL) THEN ', $increment);
+                $schema .= sprintf('NEW."%s" = GEN_ID("GEN_%s_ID",1);', $increment, $table_name);
+                $schema .= 'END^ SET TERM ; ^';
+
+                $output = $this->_query($schema);
+                if(!$output) return false;
+                */
+            }
+        }
+
+        /**
+         * @brief 조건문 작성하여 return
+         **/
+        function getCondition($output) {
+            if(!$output->conditions) return;
+
+            foreach($output->conditions as $key => $val) {
+                $sub_condition = '';
+                foreach($val['condition'] as $k =>$v) {
+                    if(!$v['value']) continue;
+
+                    $name = $v['column'];
+                    $operation = $v['operation'];
+                    $value = $v['value'];
+                    $type = $this->getColumnType($output->column_type,$name);
+                    $pipe = $v['pipe'];
+
+                    $value = $this->getConditionValue('"'.$name.'"', $value, $operation, $type, $output->column_type);
+                    if(!$value) $value = $v['value'];
+
+                    $name = $this->autoQuotes($name);
+                    $value = $this->autoValueQuotes($value, $output);
+
+                    $str = $this->getConditionPart($name, $value, $operation);
+                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
+                    $sub_condition .=  $str;
+                }
+                if($sub_condition) {
+                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
+                    $condition .= '('.$sub_condition.')';
+                }
+            }
+
+            if($condition) $condition = ' Where '.$condition;
+            return $condition;
+        }
+
+        /**
+         * @brief insertAct 처리
+         **/
+        function _executeInsertAct($output) {
+            // 테이블 정리
+            foreach($output->tables as $key => $val) {
+                $table_list[] = '"'.$this->prefix.$val.'"';
+            }
+
+            // 컬럼 정리 
+            foreach($output->columns as $key => $val) {
+                $name = $val['name'];
+                $value = $val['value'];
+
+                $value = str_replace("'", "`", $value);
+
+                if($output->column_type[$name]=="text" || $output->column_type[$name]=="bigtext"){
+                    $blh = ibase_blob_create($this->fd);
+                    ibase_blob_add($blh, $value);
+                    $value = ibase_blob_close($blh);
+                }
+                else if($output->column_type[$name]!='number') {
+//                    if(!$value) $value = 'null';
+                } elseif(!$value || is_numeric($value)) $value = (int)$value;
+
+                $column_list[] = '"'.$name.'"';
+                $value_list[] = $value;
+                $questions[] = "?";
+            }
+
+            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $questions));
+
+            $result = $this->_query($query, $value_list);
+            @ibase_commit($this->fd);
+            return $result;
+        }
+
+        /**
+         * @brief updateAct 처리
+         **/
+        function _executeUpdateAct($output) {
+            // 테이블 정리
+            foreach($output->tables as $key => $val) {
+                $table_list[] = '"'.$this->prefix.$val.'"';
+            }
+
+            // 컬럼 정리
+            foreach($output->columns as $key => $val) {
+                if(!isset($val['value'])) continue;
+                $name = $val['name'];
+                $value = $val['value'];
+
+                $value = str_replace("'", "`", $value);
+
+                if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
+                else {
+                    if($output->column_type[$name]=="text" || $output->column_type[$name]=="bigtext"){
+                        $blh = ibase_blob_create($this->fd);
+                        ibase_blob_add($blh, $value);
+                        $value = ibase_blob_close($blh);
+                    }
+                    else if($output->column_type[$name]!='number') {
+                        //$value = "'".$value."'";
+                    }
+                    elseif(!$value || is_numeric($value)) {
+                        $value = (int)$value;
+                    }
+
+                    if(strlen($value) != 0) {
+                        if(($pos = strpos($value, '+1')) !== false) {
+                            $substr = substr($value, 0, $pos);
+                            $value = '"'.$substr.'"'."+1";
+                            $column_list[] = sprintf("\"%s\" = %s", $name, $value);
+                            continue;
+                        }
+                    }
+
+                    $values[] = $value;
+                    $column_list[] = sprintf('"%s" = ?', $name);
+                }
+            }
+
+            // 조건절 정리
+            $condition = $this->getCondition($output);
+
+            $query = sprintf("update %s set %s %s;", implode(',',$table_list), implode(',',$column_list), $condition);
+            $result = $this->_query($query, $values);
+            @ibase_commit($this->fd);
+            return $result;
+        }
+
+        /**
+         * @brief deleteAct 처리
+         **/
+        function _executeDeleteAct($output) {
+            // 테이블 정리
+            foreach($output->tables as $key => $val) {
+                $table_list[] = '"'.$this->prefix.$val.'"';
+            }
+
+            // 조건절 정리
+            $condition = $this->getCondition($output);
+
+            $query = sprintf("delete from %s %s;", implode(',',$table_list), $condition);
+
+            $result = $this->_query($query);
+            @ibase_commit($this->fd);
+            return $result;
+        }
+
+        /**
+         * @brief selectAct 처리
+         *
+         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
+         * navigation이라는 method를 제공
+         **/
+        function _executeSelectAct($output) {
+            // 테이블 정리
+            $table_list = array();
+            foreach($output->tables as $key => $val) {
+				$table_list[] = sprintf("\"%s%s\" as \"%s\"", $this->prefix, $val, $key);
+            }
+
+            if(!$output->columns) {
+                $columns = '*';
+            } else {
+                $column_list = array();
+                foreach($output->columns as $key => $val) {
+                    $name = $val['name'];
+                    $alias = $val['alias'];
+					
+                    if($alias == "")
+                        $column_list[] = $this->autoQuotes($name);
+                    else
+                        $column_list[] = sprintf("%s as \"%s\"", $this->autoQuotes($name), $alias);
+                }
+                $columns = implode(',',$column_list);
+            }
+
+            $condition = $this->getCondition($output);
+
+            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $condition, $output);
+
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            if($output->order) {
+                $conditions = $this->getConditionList($output);
+                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                    foreach($output->order as $key => $val) {
+                        $col = $val[0];
+                        if(!in_array($col, array('list_order','update_order'))) continue;
+                        if($condition) $condition .= sprintf(' and "%s" < 2100000000 ', $col);
+                        else $condition = sprintf(' where "%s" < 2100000000 ', $col);
+                    }
+                }
+            }
+
+            // list_count를 사용할 경우 적용
+            if($output->list_count['value']) $limit = sprintf('FIRST %d', $output->list_count['value']);
+            else $limit = '';
+
+            $query = sprintf("select %s %s from %s %s", $limit, $columns, implode(',',$table_list), $condition);
+
+            if($output->groups) {
+                foreach($output->groups as $key => $val) {
+                    $group_list[] = $this->autoQuotes($val);
+                }
+                if(count($group_list)) $query .= sprintf(" group by %s", implode(",",$group_list));
+            }
+
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $index_list[] = sprintf("%s %s", $this->autoQuotes($val[0]), $val[1]);
+                }
+                if(count($index_list)) $query .= sprintf(" order by %s", implode(",",$index_list));
+            }
+
+            $query .= ";";
+
+            $result = $this->_query($query);
+            if($this->isError()) return;
+            $data = $this->_fetch($result, $output);
+            @ibase_commit($this->fd);
+
+            $buff = new Object();
+            $buff->data = $data;
+            return $buff;
+        }
+
+        /**
+         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
+         *
+         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
+         **/
+        function _getNavigationData($table_list, $columns, $condition, $output) {
+            require_once('./classes/page/PageHandler.class.php');
+
+            // 전체 개수를 구함
+            $count_query = sprintf('select count(*) as "count" from %s %s;', implode(',',$table_list), $condition);
+            $total_count = $this->getCountCache($output->tables, $condition);
+            if($total_count === false) {
+                $result = $this->_query($count_query);
+                $count_output = $this->_fetch($result);
+                @ibase_commit($this->fd);
+
+                $total_count = (int)$count_output->count;
+                $this->putCountCache($output->tables, $condition, $total_count);
+            }
+
+            $list_count = $output->list_count['value'];
+            if(!$list_count) $list_count = 20;
+            $page_count = $output->page_count['value'];
+            if(!$page_count) $page_count = 10;
+            $page = $output->page['value'];
+            if(!$page) $page = 1;
+
+            // 전체 페이지를 구함
+            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
+            else $total_page = 1;
+
+            // 페이지 변수를 체크
+            if($page > $total_page) $page = $total_page;
+            $start_count = ($page-1)*$list_count;
+
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            if($output->order) {
+                $conditions = $this->getConditionList($output);
+                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                    foreach($output->order as $key => $val) {
+                        $col = $val[0];
+                        if(!in_array($col, array('list_order','update_order'))) continue;
+                        if($condition) $condition .= sprintf(' and "%s" < 2100000000 ', $col);
+                        else $condition = sprintf(' where "%s" < 2100000000 ', $col);
+                    }
+                }
+            }
+
+			$limit = sprintf('FIRST %d SKIP %d ', $list_count, $start_count);
+            $query = sprintf('SELECT %s %s FROM %s %s', $limit, $columns, implode(',',$table_list), $condition);
+
+            if($output->groups) {
+                foreach($output->groups as $key => $val) {
+                    $group_list[] = $this->autoQuotes($val);
+                }
+                if(count($group_list)) $query .= sprintf(" GROUP BY %s", implode(",",$group_list));
+            }
+
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $index_list[] = sprintf("%s %s", $this->autoQuotes($val[0]), $val[1]);
+                }
+                if(count($index_list)) $query .= sprintf(" ORDER BY %s", implode(",",$index_list));
+            }
+
+            $query .= ";";
+
+            $result = $this->_query($query);
+            if($this->isError()) {
+                $buff = new Object();
+                $buff->total_count = 0;
+                $buff->total_page = 0;
+                $buff->page = 1;
+                $buff->data = array();
+
+                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+                return $buff;
+            }
+
+            $virtual_no = $total_count - ($page-1)*$list_count;
+            while($tmp = ibase_fetch_object($result)) {
+                foreach($tmp as $key => $val){
+                    $type = $output->column_type[$key];
+
+                    if($type == "text" || $type == "bigtext") {
+                        $blob_data = ibase_blob_info($tmp->{$key});
+                        $blob_hndl = ibase_blob_open($tmp->{$key});
+                        $tmp->{$key} = ibase_blob_get($blob_hndl, $blob_data[0]);
+                        ibase_blob_close($blob_hndl);
+                    }
+                }
+
+                $data[$virtual_no--] = $tmp;
+            }
+
+            @ibase_commit($this->fd);
+
+            $buff = new Object();
+            $buff->total_count = $total_count;
+            $buff->total_page = $total_page;
+            $buff->page = $page;
+            $buff->data = $data;
+
+            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+            return $buff;
+        }
+    }
+?>
diff --git a/modules/install/tpl/filter/firebird.xml b/modules/install/tpl/filter/firebird.xml
new file mode 100644
index 000000000..2ce3a6dab
--- /dev/null
+++ b/modules/install/tpl/filter/firebird.xml
@@ -0,0 +1,38 @@
+<filter name="install" module="install" act="procInstall">
+    <form>
+        <node target="db_type" required="true" />
+        <node target="db_hostname" required="true" minlength="1" maxlength="250" />
+        <node target="db_port" minlength="1" maxlength="250" />
+        <node target="db_userid" required="true" minlength="1" maxlength="250"/>
+        <node target="db_password" required="true" minlength="1" maxlength="250" />
+        <node target="db_database" required="true" minlength="1" maxlength="250" />
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
+        <node target="password1" required="true" minlength="1" maxlength="20" />
+        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
+        <node target="user_name" required="true" minlength="2" maxlength="20" />
+        <node target="nick_name" required="true" minlength="2" maxlength="20" />
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+    </form>
+    <parameter>
+        <param name="db_type" target="db_type" />
+        <param name="db_hostname" target="db_hostname" />
+        <param name="db_port" target="db_port" />
+        <param name="db_userid" target="db_userid" />
+        <param name="db_password" target="db_password" />
+        <param name="db_database" target="db_database" />
+        <param name="db_table_prefix" target="db_table_prefix" />
+        <param name="user_id" target="user_id" />
+        <param name="password" target="password1" />
+        <param name="user_name" target="user_name" />
+        <param name="nick_name" target="nick_name" />
+        <param name="email_address" target="email_address" />
+        <param name="use_rewrite" target="use_rewrite" />
+        <param name="time_zone" target="time_zone" />
+    </parameter>
+    <response callback_func="completeInstalled">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="redirect_url" />
+    </response>
+</filter>
diff --git a/modules/install/tpl/form.firebird.html b/modules/install/tpl/form.firebird.html
new file mode 100644
index 000000000..a576aeacf
--- /dev/null
+++ b/modules/install/tpl/form.firebird.html
@@ -0,0 +1,51 @@
+<!--%import("filter/firebird.xml")-->
+<!--%import("js/install_admin.js")-->
+<!--#include("header.html")-->
+
+<form action="./" method="post" onsubmit="return procFilter(this, install)">
+<input type="hidden" name="db_type" value="{$db_type}" />
+
+<h2>{$lang->form_title}</h2>
+
+    <table cellspacing="0" class="tableType7">
+    <col width="100" />
+    <col width="160" />
+    <col />
+
+    <tr>
+        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
+        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
+        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
+        <td><input type="text" name="db_port" value="3050" class="inputTypeText w100" id="textfield12" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
+        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
+        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
+        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
+    </tr>
+    <tr>
+        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
+        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
+    </tr>
+
+    <!--#include("form.install.html")-->
+
+    </table>
+
+    <div class="buttonCenter">
+        <span class="button"><input type="submit" value="{$lang->cmd_registration}" /></span>
+    </div>
+
+</form>
+
+<!--#include("footer.html")-->

From 281a720a875eefb1dfec8a13664dd22af7744ef5 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sat, 10 May 2008 03:04:19 +0000
Subject: [PATCH 086/111] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=90=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20Admin=EB=AA=A8=EB=93=88=EC=9D=98=20'Shortc?=
 =?UTF-8?q?ut'=EA=B8=B0=EB=8A=A5=20=EA=B4=80=EB=A0=A8=EB=90=9C=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC/=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
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@4184 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/admin.admin.controller.php     | 44 --------------------
 modules/admin/admin.admin.model.php          | 25 -----------
 modules/admin/admin.admin.view.php           |  7 ----
 modules/admin/admin.class.php                | 14 -------
 modules/admin/conf/module.xml                |  3 --
 modules/admin/queries/deleteShortCut.xml     |  8 ----
 modules/admin/queries/getShortCutList.xml    |  8 ----
 modules/admin/queries/insertShortCut.xml     | 13 ------
 modules/admin/schemas/admin_shortcut.xml     |  8 ----
 modules/admin/tpl/filter/delete_shortcut.xml |  9 ----
 modules/admin/tpl/js/admin.js                |  6 ---
 modules/admin/tpl/shortcut_list.html         | 32 --------------
 12 files changed, 177 deletions(-)
 delete mode 100644 modules/admin/queries/deleteShortCut.xml
 delete mode 100644 modules/admin/queries/getShortCutList.xml
 delete mode 100644 modules/admin/queries/insertShortCut.xml
 delete mode 100644 modules/admin/schemas/admin_shortcut.xml
 delete mode 100644 modules/admin/tpl/filter/delete_shortcut.xml
 delete mode 100644 modules/admin/tpl/shortcut_list.html

diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 663579937..52d62e704 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -12,50 +12,6 @@
         function init() {
         }
 
-        /**
-         * @brief 숏컷 추가
-         **/
-        function procAdminInsertShortCut() {
-            $module = Context::get('selected_module');
-
-            $output = $this->insertShortCut($module);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 숏컷의 삭제
-         **/
-        function procAdminDeleteShortCut() {
-            $args->module = Context::get('selected_module');
-
-            // 삭제 불가능 바로가기의 처리
-            if(in_array($args->module, array('module','addon','widget','layout'))) return new Object(-1, 'msg_manage_module_cannot_delete');
-
-            $output = executeQuery('admin.deleteShortCut', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 관리자 페이지의 단축 메뉴 추가
-         **/
-        function insertShortCut($module) {
-            // 선택된 모듈의 정보중에서 admin_index act를 구함
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoXml($module);
-
-            $args->module = $module;
-            $args->title = $module_info->title;
-            $args->default_act = $module_info->admin_index_act;
-            if(!$args->default_act) return new Object(-1, 'msg_default_act_is_null');
-
-            $output = executeQuery('admin.insertShortCut', $args);
-            return $output;
-        }
-
         /**
          * @brief 모든 캐시 파일 재생성
          **/
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 443dead66..1caf5a93c 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -13,30 +13,5 @@
         function init() {
         }
 
-        /**
-         * @brief admin shortcut 에 등록된 목록을 return;
-         **/
-        function getShortCuts() {
-            $output = executeQuery('admin.getShortCutList');
-            if(!$output->toBool()) return $output;
-
-            if(!is_array($output->data)) $list = array($output->data);
-            else $list = $output->data;
-
-            foreach($list as $val) {
-                $shortcut_list[$val->module] = $val;
-            }
-
-            // 모듈 목록을 구해와서 숏컷에 해당하는 타이틀을 추출
-            $oModuleModel = &getModel('module');
-            $module_list = $oModuleModel->getModulesXmlInfo();
-            foreach($module_list as $key => $val) {
-                $module_name = $val->module;
-                if($shortcut_list[$module_name]) $shortcut_list[$module_name]->title = $val->title;
-            }
-
-            return $shortcut_list;
-        }
-
     }
 ?>
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index eda2b0a47..0d6c53373 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -84,12 +84,5 @@
 
             $this->setTemplateFile('index');
         }
-
-        /**
-         * @brief 관리자 메뉴 숏컷 출력
-         **/
-        function dispAdminShortCut() {
-            $this->setTemplateFile('shortcut_list');
-        }
     }
 ?>
diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php
index 13dd5bbf6..a373b8db2 100644
--- a/modules/admin/admin.class.php
+++ b/modules/admin/admin.class.php
@@ -11,20 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // 게시판, 회원관리, 레이아웃관리등 자주 사용될 module을 admin_shortcut에 등록
-            $oAdminController = &getAdminController('admin');
-
-            $oAdminController->insertShortCut('blog');
-            $oAdminController->insertShortCut('board');
-            $oAdminController->insertShortCut('page');
-            $oAdminController->insertShortCut('opage');
-            $oAdminController->insertShortCut('menu');
-            $oAdminController->insertShortCut('layout');
-            $oAdminController->insertShortCut('addon');
-            $oAdminController->insertShortCut('widget');
-            $oAdminController->insertShortCut('member');
-            $oAdminController->insertShortCut('module');
-           
             return new Object();
         }
 
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index 8e2390264..7922023ff 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -2,10 +2,7 @@
 <module>
     <actions>
         <action name="dispAdminIndex" type="view" standalone="true" index="true"/>
-        <action name="dispAdminShortCut" type="view" standalone="true" />
 
-        <action name="procAdminInsertShortCut" type="controller" standalone="true" />
-        <action name="procAdminDeleteShortCut" type="controller" standalone="true" />
         <action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/admin/queries/deleteShortCut.xml b/modules/admin/queries/deleteShortCut.xml
deleted file mode 100644
index 7640bfb45..000000000
--- a/modules/admin/queries/deleteShortCut.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<query id="deleteShortCut" action="delete">
-    <tables>
-        <table name="admin_shortcut" />
-    </tables>
-    <conditions>
-        <condition operation="equal" column="module" var="module" notnull="notnull" />
-    </conditions>
-</query>
diff --git a/modules/admin/queries/getShortCutList.xml b/modules/admin/queries/getShortCutList.xml
deleted file mode 100644
index 797abbdc4..000000000
--- a/modules/admin/queries/getShortCutList.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<query id="getShortCutList" action="select">
-    <tables>
-        <table name="admin_shortcut" />
-    </tables>
-    <navigation>
-        <index var="sort_index" default="list_order" order="asc" />
-    </navigation>
-</query>
diff --git a/modules/admin/queries/insertShortCut.xml b/modules/admin/queries/insertShortCut.xml
deleted file mode 100644
index 29133f77c..000000000
--- a/modules/admin/queries/insertShortCut.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<query id="insertShortCut" action="insert">
-    <tables>
-        <table name="admin_shortcut" />
-    </tables>
-    <columns>
-        <column name="shortcut_srl" var="shortcut_srl" default="sequence()" filter="number" notnull="notnull" />
-        <column name="title" var="title" notnull="notnull" minlength="2" maxlength="250" />
-        <column name="module" var="module" notnull="notnull" minlength="2" maxlength="250" />
-        <column name="default_act" var="default_act" notnull="notnull" minlength="2" maxlength="250" />
-        <column name="regdate" var="regdate" default="curdate()" />
-        <column name="list_order" var="list_order" default="sequence()" />
-    </columns>
-</query>
diff --git a/modules/admin/schemas/admin_shortcut.xml b/modules/admin/schemas/admin_shortcut.xml
deleted file mode 100644
index 7494ef01d..000000000
--- a/modules/admin/schemas/admin_shortcut.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<table name="admin_shortcut">
-    <column name="shortcut_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
-    <column name="module" type="varchar" size="250" notnull="notnull" unique="uni_module" />
-    <column name="title" type="varchar" size="250" notnull="notnull" />
-    <column name="default_act" type="varchar" size="250" notnull="notnull" />
-    <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
-    <column name="regdate" type="date" />
-</table>
diff --git a/modules/admin/tpl/filter/delete_shortcut.xml b/modules/admin/tpl/filter/delete_shortcut.xml
deleted file mode 100644
index e70f82f9d..000000000
--- a/modules/admin/tpl/filter/delete_shortcut.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<filter name="delete_shortcut" module="admin" act="procAdminDeleteShortCut" confirm_msg_code="confirm_delete">
-    <form>
-        <node target="selected_module" required="true" />
-    </form>
-    <response>
-        <tag name="error" />
-        <tag name="message" />
-    </response>
-</filter>
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index de245ccfc..2717fbb03 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -4,12 +4,6 @@
  * @brief  admin 모듈의 javascript
  **/
 
-// 숏컷 삭제
-function doDeleteShortCut(selected_module) {
-    var fo_obj = xGetElementById('fo_shortcut_info');
-    fo_obj.selected_module.value = selected_module;
-    procFilter(fo_obj, delete_shortcut);
-}
 
 // 캐시파일 모두 재 생성
 function doRecompileCacheFile() {
diff --git a/modules/admin/tpl/shortcut_list.html b/modules/admin/tpl/shortcut_list.html
deleted file mode 100644
index 7f3f0ea74..000000000
--- a/modules/admin/tpl/shortcut_list.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--%import("filter/delete_shortcut.xml")-->
-<!--%import("js/admin.js")-->
-
-<h3>{$lang->cmd_shortcut_management}</h3>
-
-<div class="infoText">{$lang->about_shortcut}</div>
-
-<!-- 숏컷의 위/아래, 삭제와 관련된 form -->
-<form id="fo_shortcut_info" action="./" method="get">
-    <input type="hidden" name="selected_module" value="" />
-</form>
-
-<table cellspacing="0" class="tableType3">
-<thead>
-    <tr>
-        <th scope="col">{$lang->title}</th>
-        <th scope="col">{$lang->module}</th>
-        <th scope="col">{$lang->regdate}</th>
-        <th scope="col">{$lang->cmd_delete}</th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($shortcut_list as $shortcut_info)-->
-    <tr>
-        <th scope="row">{$shortcut_info->title}</th>
-        <td class="tahoma">{$shortcut_info->module}</td>
-        <td class="tahoma">{zdate($shortcut_info->regdate,"Y-m-d H:i:s")}</td>
-        <td><a href="#" onclick="doDeleteShortCut('{$shortcut_info->module}');return false;" class="red">{$lang->cmd_delete}</a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>

From e18563616134d0297a9d024baac7fa95e4741232 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sun, 11 May 2008 15:11:43 +0000
Subject: [PATCH 087/111] =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=9A=A9=20Calendar=EC=9D=84=20DyCalendar=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
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@4185 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/calendar-en.js                      |   58 +-
 common/js/calendar-ko.js                      |   56 +-
 common/js/calendar-setup.js                   |  142 +-
 common/js/calendar.js                         | 1790 +----------------
 .../board/skins/xe_board/extra_var_form.html  |    2 +-
 .../skins/xe_guestbook/extra_var_form.html    |    2 +-
 modules/counter/tpl/index.html                |    2 +-
 .../components/poll_maker/tpl/popup.html      |    2 +-
 modules/member/skins/default/modify_info.html |    4 +-
 modules/member/skins/default/signup_form.html |    4 +-
 modules/member/tpl/insert_member.html         |    6 +-
 11 files changed, 70 insertions(+), 1998 deletions(-)

diff --git a/common/js/calendar-en.js b/common/js/calendar-en.js
index 0dbde793d..6de06b2a8 100644
--- a/common/js/calendar-en.js
+++ b/common/js/calendar-en.js
@@ -1,6 +1,6 @@
 // ** I18N
 
-// Calendar EN language
+// DyCalendar EN language
 // Author: Mihai Bazon, <mihai_bazon@yahoo.com>
 // Encoding: any
 // Distributed under the same terms as the calendar itself.
@@ -10,7 +10,7 @@
 // include your contact information in the header, as can be seen above.
 
 // full day names
-Calendar._DN = new Array
+DyCalendar._DN = new Array
 ("Sunday",
  "Monday",
  "Tuesday",
@@ -25,15 +25,15 @@ Calendar._DN = new Array
 // for exemplification on how one can customize the short day names, but if
 // they are simply the first N letters of the full name you can simply say:
 //
-//   Calendar._SDN_len = N; // short day name length
-//   Calendar._SMN_len = N; // short month name length
+//   DyCalendar._SDN_len = N; // short day name length
+//   DyCalendar._SMN_len = N; // short month name length
 //
 // If N = 3 then this is not needed either since we assume a value of 3 if not
 // present, to be compatible with translation files that were written before
 // this feature.
 
 // short day names
-Calendar._SDN = new Array
+DyCalendar._SDN = new Array
 ("Sun",
  "Mon",
  "Tue",
@@ -45,10 +45,10 @@ Calendar._SDN = new Array
 
 // First day of the week. "0" means display Sunday first, "1" means display
 // Monday first, etc.
-Calendar._FD = 0;
+DyCalendar._FD = 0;
 
 // full month names
-Calendar._MN = new Array
+DyCalendar._MN = new Array
 ("January",
  "February",
  "March",
@@ -63,7 +63,7 @@ Calendar._MN = new Array
  "December");
 
 // short month names
-Calendar._SMN = new Array
+DyCalendar._SMN = new Array
 ("Jan",
  "Feb",
  "Mar",
@@ -78,10 +78,10 @@ Calendar._SMN = new Array
  "Dec");
 
 // tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "About the calendar";
+DyCalendar._TT = {};
+DyCalendar._TT["INFO"] = "About the calendar";
 
-Calendar._TT["ABOUT"] =
+DyCalendar._TT["ABOUT"] =
 "DHTML Date/Time Selector\n" +
 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
 "For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
@@ -91,37 +91,37 @@ Calendar._TT["ABOUT"] =
 "- Use the \xab, \xbb buttons to select year\n" +
 "- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
 "- Hold mouse button on any of the above buttons for faster selection.";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
+DyCalendar._TT["ABOUT_TIME"] = "\n\n" +
 "Time selection:\n" +
 "- Click on any of the time parts to increase it\n" +
 "- or Shift-click to decrease it\n" +
 "- or click and drag for faster selection.";
 
-Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
-Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
-Calendar._TT["GO_TODAY"] = "Go Today";
-Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
-Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
-Calendar._TT["SEL_DATE"] = "Select date";
-Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
-Calendar._TT["PART_TODAY"] = " (today)";
+DyCalendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+DyCalendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+DyCalendar._TT["GO_TODAY"] = "Go Today";
+DyCalendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+DyCalendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+DyCalendar._TT["SEL_DATE"] = "Select date";
+DyCalendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+DyCalendar._TT["PART_TODAY"] = " (today)";
 
 // the following is to inform that "%s" is to be the first day of week
 // %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "Display %s first";
+DyCalendar._TT["DAY_FIRST"] = "Display %s first";
 
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
 // means Monday, etc.
-Calendar._TT["WEEKEND"] = "0,6";
+DyCalendar._TT["WEEKEND"] = "0,6";
 
-Calendar._TT["CLOSE"] = "Close";
-Calendar._TT["TODAY"] = "Today";
-Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+DyCalendar._TT["CLOSE"] = "Close";
+DyCalendar._TT["TODAY"] = "Today";
+DyCalendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
 
 // date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
-Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+DyCalendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+DyCalendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
 
-Calendar._TT["WK"] = "wk";
-Calendar._TT["TIME"] = "Time:";
+DyCalendar._TT["WK"] = "wk";
+DyCalendar._TT["TIME"] = "Time:";
diff --git a/common/js/calendar-ko.js b/common/js/calendar-ko.js
index 6023b743a..2033dafc3 100644
--- a/common/js/calendar-ko.js
+++ b/common/js/calendar-ko.js
@@ -1,6 +1,6 @@
 // ** I18N
 
-// Calendar KO language
+// DyCalendar KO language
 // Author: Mihai Bazon, <mihai_bazon@yahoo.com>
 // Translation: Yourim Yi <yyi@yourim.net>
 // Encoding: UTF-8
@@ -13,7 +13,7 @@
 
 // full day names
 
-Calendar._DN = new Array
+DyCalendar._DN = new Array
 ("일요일",
  "월요일",
  "화요일",
@@ -28,15 +28,15 @@ Calendar._DN = new Array
 // for exemplification on how one can customize the short day names, but if
 // they are simply the first N letters of the full name you can simply say:
 //
-//   Calendar._SDN_len = N; // short day name length
-//   Calendar._SMN_len = N; // short month name length
+//   DyCalendar._SDN_len = N; // short day name length
+//   DyCalendar._SMN_len = N; // short month name length
 //
 // If N = 3 then this is not needed either since we assume a value of 3 if not
 // present, to be compatible with translation files that were written before
 // this feature.
 
 // short day names
-Calendar._SDN = new Array
+DyCalendar._SDN = new Array
 ("일",
  "월",
  "화",
@@ -47,7 +47,7 @@ Calendar._SDN = new Array
  "일");
 
 // full month names
-Calendar._MN = new Array
+DyCalendar._MN = new Array
 ("1월",
  "2월",
  "3월",
@@ -62,7 +62,7 @@ Calendar._MN = new Array
  "12월");
 
 // short month names
-Calendar._SMN = new Array
+DyCalendar._SMN = new Array
 ("1",
  "2",
  "3",
@@ -77,10 +77,10 @@ Calendar._SMN = new Array
  "12");
 
 // tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "calendar 소개";
+DyCalendar._TT = {};
+DyCalendar._TT["INFO"] = "calendar 소개";
 
-Calendar._TT["ABOUT"] =
+DyCalendar._TT["ABOUT"] =
 "DHTML Date/Time Selector\n" +
 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
 "\n"+
@@ -93,32 +93,32 @@ Calendar._TT["ABOUT"] =
 "- 연도를 선택하려면 \xab, \xbb 버튼을 사용합니다\n" +
 "- 달을 선택하려면 " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " 버튼을 누르세요\n" +
 "- 계속 누르고 있으면 위 값들을 빠르게 선택하실 수 있습니다.";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
+DyCalendar._TT["ABOUT_TIME"] = "\n\n" +
 "시간 선택:\n" +
 "- 마우스로 누르면 시간이 증가합니다\n" +
 "- Shift 키와 함께 누르면 감소합니다\n" +
 "- 누른 상태에서 마우스를 움직이면 좀 더 빠르게 값이 변합니다.\n";
 
-Calendar._TT["PREV_YEAR"] = "지난 해 (길게 누르면 목록)";
-Calendar._TT["PREV_MONTH"] = "지난 달 (길게 누르면 목록)";
-Calendar._TT["GO_TODAY"] = "오늘 날짜로";
-Calendar._TT["NEXT_MONTH"] = "다음 달 (길게 누르면 목록)";
-Calendar._TT["NEXT_YEAR"] = "다음 해 (길게 누르면 목록)";
-Calendar._TT["SEL_DATE"] = "날짜를 선택하세요";
-Calendar._TT["DRAG_TO_MOVE"] = "마우스 드래그로 이동 하세요";
-Calendar._TT["PART_TODAY"] = " (오늘)";
+DyCalendar._TT["PREV_YEAR"] = "지난 해 (길게 누르면 목록)";
+DyCalendar._TT["PREV_MONTH"] = "지난 달 (길게 누르면 목록)";
+DyCalendar._TT["GO_TODAY"] = "오늘 날짜로";
+DyCalendar._TT["NEXT_MONTH"] = "다음 달 (길게 누르면 목록)";
+DyCalendar._TT["NEXT_YEAR"] = "다음 해 (길게 누르면 목록)";
+DyCalendar._TT["SEL_DATE"] = "날짜를 선택하세요";
+DyCalendar._TT["DRAG_TO_MOVE"] = "마우스 드래그로 이동 하세요";
+DyCalendar._TT["PART_TODAY"] = " (오늘)";
 
-Calendar._TT["DAY_FIRST"] = "%s 먼저 표시";
+DyCalendar._TT["DAY_FIRST"] = "%s 먼저 표시";
 
-Calendar._TT["WEEKEND"] = "0,6";
+DyCalendar._TT["WEEKEND"] = "0,6";
 
-Calendar._TT["CLOSE"] = "닫기";
-Calendar._TT["TODAY"] = "오늘";
-Calendar._TT["TIME_PART"] = "(Shift-)클릭 또는 드래그 하세요";
+DyCalendar._TT["CLOSE"] = "닫기";
+DyCalendar._TT["TODAY"] = "오늘";
+DyCalendar._TT["TIME_PART"] = "(Shift-)클릭 또는 드래그 하세요";
 
 // date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
-Calendar._TT["TT_DATE_FORMAT"] = "%b/%e [%a]";
+DyCalendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+DyCalendar._TT["TT_DATE_FORMAT"] = "%b/%e [%a]";
 
-Calendar._TT["WK"] = "주";
-Calendar._TT["TIME"] = "시:";
+DyCalendar._TT["WK"] = "주";
+DyCalendar._TT["TIME"] = "시:";
diff --git a/common/js/calendar-setup.js b/common/js/calendar-setup.js
index 78e69564b..620b9ebde 100644
--- a/common/js/calendar-setup.js
+++ b/common/js/calendar-setup.js
@@ -59,144 +59,4 @@
  *  pass none of "inputField", "displayArea" or "button" you'll get a warning
  *  saying "nothing to setup".
  */
-Calendar.setup = function (params) {
-	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
-
-	param_default("inputField",     null);
-	param_default("displayArea",    null);
-	param_default("button",         null);
-	param_default("eventName",      "click");
-	param_default("ifFormat",       "%Y/%m/%d");
-	param_default("daFormat",       "%Y/%m/%d");
-	param_default("singleClick",    true);
-	param_default("disableFunc",    null);
-	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
-	param_default("dateText",       null);
-	param_default("firstDay",       null);
-	param_default("align",          "Br");
-	param_default("range",          [1900, 2999]);
-	param_default("weekNumbers",    true);
-	param_default("flat",           null);
-	param_default("flatCallback",   null);
-	param_default("onSelect",       null);
-	param_default("onClose",        null);
-	param_default("onUpdate",       null);
-	param_default("date",           null);
-	param_default("showsTime",      false);
-	param_default("timeFormat",     "24");
-	param_default("electric",       true);
-	param_default("step",           2);
-	param_default("position",       null);
-	param_default("cache",          false);
-	param_default("showOthers",     false);
-	param_default("multiple",       null);
-
-	var tmp = ["inputField", "displayArea", "button"];
-	for (var i in tmp) {
-		if (typeof params[tmp[i]] == "string") {
-			params[tmp[i]] = document.getElementById(params[tmp[i]]);
-		}
-	}
-	if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
-		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
-		return false;
-	}
-
-	function onSelect(cal) {
-		var p = cal.params;
-		var update = (cal.dateClicked || p.electric);
-		if (update && p.inputField) {
-			p.inputField.value = cal.date.print(p.ifFormat);
-			if (typeof p.inputField.onchange == "function")
-				p.inputField.onchange();
-		}
-		if (update && p.displayArea)
-			p.displayArea.innerHTML = cal.date.print(p.daFormat);
-		if (update && typeof p.onUpdate == "function")
-			p.onUpdate(cal);
-		if (update && p.flat) {
-			if (typeof p.flatCallback == "function")
-				p.flatCallback(cal);
-		}
-		if (update && p.singleClick && cal.dateClicked)
-			cal.callCloseHandler();
-	};
-
-	if (params.flat != null) {
-		if (typeof params.flat == "string")
-			params.flat = document.getElementById(params.flat);
-		if (!params.flat) {
-			alert("Calendar.setup:\n  Flat specified but can't find parent.");
-			return false;
-		}
-		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
-		cal.showsOtherMonths = params.showOthers;
-		cal.showsTime = params.showsTime;
-		cal.time24 = (params.timeFormat == "24");
-		cal.params = params;
-		cal.weekNumbers = params.weekNumbers;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.getDateText = params.dateText;
-		if (params.ifFormat) {
-			cal.setDateFormat(params.ifFormat);
-		}
-		if (params.inputField && typeof params.inputField.value == "string") {
-			cal.parseDate(params.inputField.value);
-		}
-		cal.create(params.flat);
-		cal.show();
-		return false;
-	}
-
-	var triggerEl = params.button || params.displayArea || params.inputField;
-	triggerEl["on" + params.eventName] = function() {
-		var dateEl = null;
-        if(params.displayArea) dateEl = params.displayArea;
-        else dateEl = params.inputField;
-		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
-		var mustCreate = false;
-		var cal = window.calendar;
-		if (dateEl)
-			params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
-		if (!(cal && params.cache)) {
-			window.calendar = cal = new Calendar(params.firstDay,
-							     params.date,
-							     params.onSelect || onSelect,
-							     params.onClose || function(cal) { cal.hide(); });
-			cal.showsTime = params.showsTime;
-			cal.time24 = (params.timeFormat == "24");
-			cal.weekNumbers = params.weekNumbers;
-			mustCreate = true;
-		} else {
-			if (params.date)
-				cal.setDate(params.date);
-			cal.hide();
-		}
-		if (params.multiple) {
-			cal.multiple = {};
-			for (var i = params.multiple.length; --i >= 0;) {
-				var d = params.multiple[i];
-				var ds = d.print("%Y%m%d");
-				cal.multiple[ds] = d;
-			}
-		}
-		cal.showsOtherMonths = params.showOthers;
-		cal.yearStep = params.step;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.params = params;
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.getDateText = params.dateText;
-		cal.setDateFormat(dateFmt);
-		if (mustCreate)
-			cal.create();
-		cal.refresh();
-		if (!params.position)
-			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
-		else
-			cal.showAt(params.position[0], params.position[1]);
-		return false;
-	};
-
-	return cal;
-};
+DyCalendar.setup=function(params){function param_default(pname,def){if(typeof params[pname]=="undefined"){params[pname]=def}};param_default("inputField",null);param_default("displayArea",null);param_default("button",null);param_default("eventName","click");param_default("ifFormat","%Y/%m/%d");param_default("daFormat","%Y/%m/%d");param_default("singleClick",true);param_default("disableFunc",null);param_default("dateStatusFunc",params["disableFunc"]);param_default("dateText",null);param_default("firstDay",null);param_default("align","Br");param_default("range",[1900,2999]);param_default("weekNumbers",true);param_default("flat",null);param_default("flatCallback",null);param_default("onSelect",null);param_default("onClose",null);param_default("onUpdate",null);param_default("date",null);param_default("showsTime",false);param_default("timeFormat","24");param_default("electric",true);param_default("step",2);param_default("position",null);param_default("cache",false);param_default("showOthers",false);param_default("multiple",null);var tmp=["inputField","displayArea","button"];for(var i in tmp){if(typeof params[tmp[i]]=="string"){params[tmp[i]]=document.getElementById(params[tmp[i]])}}if(!(params.flat||params.multiple||params.inputField||params.displayArea||params.button)){alert("DyCalendar.setup:\n  Nothing to setup (no fields found).  Please check your code");return false}function onSelect(cal){var p=cal.params;var update=(cal.dateClicked||p.electric);if(update&&p.inputField){p.inputField.value=cal.date.print(p.ifFormat);if(typeof p.inputField.onchange=="function")p.inputField.onchange()}if(update&&p.displayArea)p.displayArea.innerHTML=cal.date.print(p.daFormat);if(update&&typeof p.onUpdate=="function")p.onUpdate(cal);if(update&&p.flat){if(typeof p.flatCallback=="function")p.flatCallback(cal)}if(update&&p.singleClick&&cal.dateClicked)cal.callCloseHandler()};if(params.flat!=null){if(typeof params.flat=="string")params.flat=document.getElementById(params.flat);if(!params.flat){alert("DyCalendar.setup:\n  Flat specified but can't find parent.");return false}var cal=new DyCalendar(params.firstDay,params.date,params.onSelect||onSelect);cal.showsOtherMonths=params.showOthers;cal.showsTime=params.showsTime;cal.time24=(params.timeFormat=="24");cal.params=params;cal.weekNumbers=params.weekNumbers;cal.setRange(params.range[0],params.range[1]);cal.setDateStatusHandler(params.dateStatusFunc);cal.getDateText=params.dateText;if(params.ifFormat){cal.setDateFormat(params.ifFormat)}if(params.inputField&&typeof params.inputField.value=="string"){cal.parseDate(params.inputField.value)}cal.create(params.flat);cal.show();return false}var triggerEl=params.button||params.displayArea||params.inputField;triggerEl["on"+params.eventName]=function(){var dateEl=null;if(params.displayArea)dateEl=params.displayArea;else dateEl=params.inputField;var dateFmt=params.inputField?params.ifFormat:params.daFormat;var mustCreate=false;var cal=window.calendar;if(dateEl)params.date=Date.parseDate(dateEl.value||dateEl.innerHTML,dateFmt);if(!(cal&&params.cache)){window.calendar=cal=new DyCalendar(params.firstDay,params.date,params.onSelect||onSelect,params.onClose||function(cal){cal.hide()});cal.showsTime=params.showsTime;cal.time24=(params.timeFormat=="24");cal.weekNumbers=params.weekNumbers;mustCreate=true}else{if(params.date)cal.setDate(params.date);cal.hide()}if(params.multiple){cal.multiple={};for(var i=params.multiple.length;--i>=0;){var d=params.multiple[i];var ds=d.print("%Y%m%d");cal.multiple[ds]=d}}cal.showsOtherMonths=params.showOthers;cal.yearStep=params.step;cal.setRange(params.range[0],params.range[1]);cal.params=params;cal.setDateStatusHandler(params.dateStatusFunc);cal.getDateText=params.dateText;cal.setDateFormat(dateFmt);if(mustCreate)cal.create();cal.refresh();if(!params.position)cal.showAtElement(params.button||params.displayArea||params.inputField,params.align);else cal.showAt(params.position[0],params.position[1]);return false};return cal};
\ No newline at end of file
diff --git a/common/js/calendar.js b/common/js/calendar.js
index 9088e0e89..50ae2ae74 100644
--- a/common/js/calendar.js
+++ b/common/js/calendar.js
@@ -15,1792 +15,4 @@
 // $Id: calendar.js,v 1.51 2005/03/07 16:44:31 mishoo Exp $
 
 /** The Calendar object constructor. */
-Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
-	// member variables
-	this.activeDiv = null;
-	this.currentDateEl = null;
-	this.getDateStatus = null;
-	this.getDateToolTip = null;
-	this.getDateText = null;
-	this.timeout = null;
-	this.onSelected = onSelected || null;
-	this.onClose = onClose || null;
-	this.dragging = false;
-	this.hidden = false;
-	this.minYear = 1970;
-	this.maxYear = 2050;
-	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
-	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
-	this.isPopup = true;
-	this.weekNumbers = true;
-	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
-	this.showsOtherMonths = false;
-	this.dateStr = dateStr;
-	this.ar_days = null;
-	this.showsTime = false;
-	this.time24 = true;
-	this.yearStep = 2;
-	this.hiliteToday = true;
-	this.multiple = null;
-	// HTML elements
-	this.table = null;
-	this.element = null;
-	this.tbody = null;
-	this.firstdayname = null;
-	// Combo boxes
-	this.monthsCombo = null;
-	this.yearsCombo = null;
-	this.hilitedMonth = null;
-	this.activeMonth = null;
-	this.hilitedYear = null;
-	this.activeYear = null;
-	// Information
-	this.dateClicked = false;
-
-	// one-time initializations
-	if (typeof Calendar._SDN == "undefined") {
-		// table of short day names
-		if (typeof Calendar._SDN_len == "undefined")
-			Calendar._SDN_len = 3;
-		var ar = new Array();
-		for (var i = 8; i > 0;) {
-			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
-		}
-		Calendar._SDN = ar;
-		// table of short month names
-		if (typeof Calendar._SMN_len == "undefined")
-			Calendar._SMN_len = 3;
-		ar = new Array();
-		for (var i = 12; i > 0;) {
-			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
-		}
-		Calendar._SMN = ar;
-	}
-};
-
-// ** constants
-
-/// "static", needed for event handlers.
-Calendar._C = null;
-
-/// detect a special case of "web browser"
-Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
-		   !/opera/i.test(navigator.userAgent) );
-
-Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
-
-/// detect Opera browser
-Calendar.is_opera = /opera/i.test(navigator.userAgent);
-
-/// detect KHTML-based browsers
-Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
-
-// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
-//        library, at some point.
-
-Calendar.getAbsolutePos = function(el) {
-	var SL = 0, ST = 0;
-	var is_div = /^div$/i.test(el.tagName);
-	if (is_div && el.scrollLeft)
-		SL = el.scrollLeft;
-	if (is_div && el.scrollTop)
-		ST = el.scrollTop;
-	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
-	if (el.offsetParent) {
-		var tmp = this.getAbsolutePos(el.offsetParent);
-		r.x += tmp.x;
-		r.y += tmp.y;
-	}
-	return r;
-};
-
-Calendar.isRelated = function (el, evt) {
-	var related = evt.relatedTarget;
-	if (!related) {
-		var type = evt.type;
-		if (type == "mouseover") {
-			related = evt.fromElement;
-		} else if (type == "mouseout") {
-			related = evt.toElement;
-		}
-	}
-	while (related) {
-		if (related == el) {
-			return true;
-		}
-		related = related.parentNode;
-	}
-	return false;
-};
-
-Calendar.removeClass = function(el, className) {
-	if (!(el && el.className)) {
-		return;
-	}
-	var cls = el.className.split(" ");
-	var ar = new Array();
-	for (var i = cls.length; i > 0;) {
-		if (cls[--i] != className) {
-			ar[ar.length] = cls[i];
-		}
-	}
-	el.className = ar.join(" ");
-};
-
-Calendar.addClass = function(el, className) {
-	Calendar.removeClass(el, className);
-	el.className += " " + className;
-};
-
-// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
-Calendar.getElement = function(ev) {
-	var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
-	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
-		f = f.parentNode;
-	return f;
-};
-
-Calendar.getTargetElement = function(ev) {
-	var f = Calendar.is_ie ? window.event.srcElement : ev.target;
-	while (f.nodeType != 1)
-		f = f.parentNode;
-	return f;
-};
-
-Calendar.stopEvent = function(ev) {
-	ev || (ev = window.event);
-	if (Calendar.is_ie) {
-		ev.cancelBubble = true;
-		ev.returnValue = false;
-	} else {
-		ev.preventDefault();
-		ev.stopPropagation();
-	}
-	return false;
-};
-
-Calendar.addEvent = function(el, evname, func) {
-	if (el.attachEvent) { // IE
-		el.attachEvent("on" + evname, func);
-	} else if (el.addEventListener) { // Gecko / W3C
-		el.addEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = func;
-	}
-};
-
-Calendar.removeEvent = function(el, evname, func) {
-	if (el.detachEvent) { // IE
-		el.detachEvent("on" + evname, func);
-	} else if (el.removeEventListener) { // Gecko / W3C
-		el.removeEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = null;
-	}
-};
-
-Calendar.createElement = function(type, parent) {
-	var el = null;
-	if (document.createElementNS) {
-		// use the XHTML namespace; IE won't normally get here unless
-		// _they_ "fix" the DOM2 implementation.
-		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
-	} else {
-		el = document.createElement(type);
-	}
-	if (typeof parent != "undefined") {
-		parent.appendChild(el);
-	}
-	return el;
-};
-
-// END: UTILITY FUNCTIONS
-
-// BEGIN: CALENDAR STATIC FUNCTIONS
-
-/** Internal -- adds a set of events to make some element behave like a button. */
-Calendar._add_evs = function(el) {
-	with (Calendar) {
-		addEvent(el, "mouseover", dayMouseOver);
-		addEvent(el, "mousedown", dayMouseDown);
-		addEvent(el, "mouseout", dayMouseOut);
-		if (is_ie) {
-			addEvent(el, "dblclick", dayMouseDblClick);
-			el.setAttribute("unselectable", true);
-		}
-	}
-};
-
-Calendar.findMonth = function(el) {
-	if (typeof el.month != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.month != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.findYear = function(el) {
-	if (typeof el.year != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.year != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.showMonthsCombo = function () {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var mc = cal.monthsCombo;
-	if (cal.hilitedMonth) {
-		Calendar.removeClass(cal.hilitedMonth, "hilite");
-	}
-	if (cal.activeMonth) {
-		Calendar.removeClass(cal.activeMonth, "active");
-	}
-	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
-	Calendar.addClass(mon, "active");
-	cal.activeMonth = mon;
-	var s = mc.style;
-	s.display = "block";
-	if (cd.navtype < 0)
-		s.left = cd.offsetLeft + "px";
-	else {
-		var mcw = mc.offsetWidth;
-		if (typeof mcw == "undefined")
-			// Konqueror brain-dead techniques
-			mcw = 50;
-		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
-	}
-	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-};
-
-Calendar.showYearsCombo = function (fwd) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var yc = cal.yearsCombo;
-	if (cal.hilitedYear) {
-		Calendar.removeClass(cal.hilitedYear, "hilite");
-	}
-	if (cal.activeYear) {
-		Calendar.removeClass(cal.activeYear, "active");
-	}
-	cal.activeYear = null;
-	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
-	var yr = yc.firstChild;
-	var show = false;
-	for (var i = 12; i > 0; --i) {
-		if (Y >= cal.minYear && Y <= cal.maxYear) {
-			yr.innerHTML = Y;
-			yr.year = Y;
-			yr.style.display = "block";
-			show = true;
-		} else {
-			yr.style.display = "none";
-		}
-		yr = yr.nextSibling;
-		Y += fwd ? cal.yearStep : -cal.yearStep;
-	}
-	if (show) {
-		var s = yc.style;
-		s.display = "block";
-		if (cd.navtype < 0)
-			s.left = cd.offsetLeft + "px";
-		else {
-			var ycw = yc.offsetWidth;
-			if (typeof ycw == "undefined")
-				// Konqueror brain-dead techniques
-				ycw = 50;
-			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
-		}
-		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-	}
-};
-
-// event handlers
-
-Calendar.tableMouseUp = function(ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	if (cal.timeout) {
-		clearTimeout(cal.timeout);
-	}
-	var el = cal.activeDiv;
-	if (!el) {
-		return false;
-	}
-	var target = Calendar.getTargetElement(ev);
-	ev || (ev = window.event);
-	Calendar.removeClass(el, "active");
-	if (target == el || target.parentNode == el) {
-		Calendar.cellClick(el, ev);
-	}
-	var mon = Calendar.findMonth(target);
-	var date = null;
-	if (mon) {
-		date = new Date(cal.date);
-		if (mon.month != date.getMonth()) {
-			date.setMonth(mon.month);
-			cal.setDate(date);
-			cal.dateClicked = false;
-			cal.callHandler();
-		}
-	} else {
-		var year = Calendar.findYear(target);
-		if (year) {
-			date = new Date(cal.date);
-			if (year.year != date.getFullYear()) {
-				date.setFullYear(year.year);
-				cal.setDate(date);
-				cal.dateClicked = false;
-				cal.callHandler();
-			}
-		}
-	}
-	with (Calendar) {
-		removeEvent(document, "mouseup", tableMouseUp);
-		removeEvent(document, "mouseover", tableMouseOver);
-		removeEvent(document, "mousemove", tableMouseOver);
-		cal._hideCombos();
-		_C = null;
-		return stopEvent(ev);
-	}
-};
-
-Calendar.tableMouseOver = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return;
-	}
-	var el = cal.activeDiv;
-	var target = Calendar.getTargetElement(ev);
-	if (target == el || target.parentNode == el) {
-		Calendar.addClass(el, "hilite active");
-		Calendar.addClass(el.parentNode, "rowhilite");
-	} else {
-		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
-			Calendar.removeClass(el, "active");
-		Calendar.removeClass(el, "hilite");
-		Calendar.removeClass(el.parentNode, "rowhilite");
-	}
-	ev || (ev = window.event);
-	if (el.navtype == 50 && target != el) {
-		var pos = Calendar.getAbsolutePos(el);
-		var w = el.offsetWidth;
-		var x = ev.clientX;
-		var dx;
-		var decrease = true;
-		if (x > pos.x + w) {
-			dx = x - pos.x - w;
-			decrease = false;
-		} else
-			dx = pos.x - x;
-
-		if (dx < 0) dx = 0;
-		var range = el._range;
-		var current = el._current;
-		var count = Math.floor(dx / 10) % range.length;
-		for (var i = range.length; --i >= 0;)
-			if (range[i] == current)
-				break;
-		while (count-- > 0)
-			if (decrease) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-		var newval = range[i];
-		el.innerHTML = newval;
-
-		cal.onUpdateTime();
-	}
-	var mon = Calendar.findMonth(target);
-	if (mon) {
-		if (mon.month != cal.date.getMonth()) {
-			if (cal.hilitedMonth) {
-				Calendar.removeClass(cal.hilitedMonth, "hilite");
-			}
-			Calendar.addClass(mon, "hilite");
-			cal.hilitedMonth = mon;
-		} else if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-	} else {
-		if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-		var year = Calendar.findYear(target);
-		if (year) {
-			if (year.year != cal.date.getFullYear()) {
-				if (cal.hilitedYear) {
-					Calendar.removeClass(cal.hilitedYear, "hilite");
-				}
-				Calendar.addClass(year, "hilite");
-				cal.hilitedYear = year;
-			} else if (cal.hilitedYear) {
-				Calendar.removeClass(cal.hilitedYear, "hilite");
-			}
-		} else if (cal.hilitedYear) {
-			Calendar.removeClass(cal.hilitedYear, "hilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.tableMouseDown = function (ev) {
-	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
-		return Calendar.stopEvent(ev);
-	}
-};
-
-Calendar.calDragIt = function (ev) {
-	var cal = Calendar._C;
-	if (!(cal && cal.dragging)) {
-		return false;
-	}
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posX = ev.pageX;
-		posY = ev.pageY;
-	}
-	cal.hideShowCovered();
-	var st = cal.element.style;
-	st.left = (posX - cal.xOffs) + "px";
-	st.top = (posY - cal.yOffs) + "px";
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.calDragEnd = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	cal.dragging = false;
-	with (Calendar) {
-		removeEvent(document, "mousemove", calDragIt);
-		removeEvent(document, "mouseup", calDragEnd);
-		tableMouseUp(ev);
-	}
-	cal.hideShowCovered();
-};
-
-Calendar.dayMouseDown = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (el.disabled) {
-		return false;
-	}
-	var cal = el.calendar;
-	cal.activeDiv = el;
-	Calendar._C = cal;
-	if (el.navtype != 300) with (Calendar) {
-		if (el.navtype == 50) {
-			el._current = el.innerHTML;
-			addEvent(document, "mousemove", tableMouseOver);
-		} else
-			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
-		addClass(el, "hilite active");
-		addEvent(document, "mouseup", tableMouseUp);
-	} else if (cal.isPopup) {
-		cal._dragStart(ev);
-	}
-	if (el.navtype == -1 || el.navtype == 1) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
-	} else if (el.navtype == -2 || el.navtype == 2) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
-	} else {
-		cal.timeout = null;
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseDblClick = function(ev) {
-	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
-	if (Calendar.is_ie) {
-		document.selection.empty();
-	}
-};
-
-Calendar.dayMouseOver = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
-		return false;
-	}
-	if (el.ttip) {
-		if (el.ttip.substr(0, 1) == "_") {
-			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
-		}
-		el.calendar.tooltips.innerHTML = el.ttip;
-	}
-	if (el.navtype != 300) {
-		Calendar.addClass(el, "hilite");
-		if (el.caldate) {
-			Calendar.addClass(el.parentNode, "rowhilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseOut = function(ev) {
-	with (Calendar) {
-		var el = getElement(ev);
-		if (isRelated(el, ev) || _C || el.disabled)
-			return false;
-		removeClass(el, "hilite");
-		if (el.caldate)
-			removeClass(el.parentNode, "rowhilite");
-		if (el.calendar)
-			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
-		return stopEvent(ev);
-	}
-};
-
-/**
- *  A generic "click" handler :) handles all types of buttons defined in this
- *  calendar.
- */
-Calendar.cellClick = function(el, ev) {
-	var cal = el.calendar;
-	var closing = false;
-	var newdate = false;
-	var date = null;
-	if (typeof el.navtype == "undefined") {
-		if (cal.currentDateEl) {
-			Calendar.removeClass(cal.currentDateEl, "selected");
-			Calendar.addClass(el, "selected");
-			closing = (cal.currentDateEl == el);
-			if (!closing) {
-				cal.currentDateEl = el;
-			}
-		}
-		cal.date.setDateOnly(el.caldate);
-		date = cal.date;
-		var other_month = !(cal.dateClicked = !el.otherMonth);
-		if (!other_month && !cal.currentDateEl)
-			cal._toggleMultipleDate(new Date(date));
-		else
-			newdate = !el.disabled;
-		// a date was clicked
-		if (other_month)
-			cal._init(cal.firstDayOfWeek, date);
-	} else {
-		if (el.navtype == 200) {
-			Calendar.removeClass(el, "hilite");
-			cal.callCloseHandler();
-			return;
-		}
-		date = new Date(cal.date);
-		if (el.navtype == 0)
-			date.setDateOnly(new Date()); // TODAY
-		// unless "today" was clicked, we assume no date was clicked so
-		// the selected handler will know not to close the calenar when
-		// in single-click mode.
-		// cal.dateClicked = (el.navtype == 0);
-		cal.dateClicked = false;
-		var year = date.getFullYear();
-		var mon = date.getMonth();
-		function setMonth(m) {
-			var day = date.getDate();
-			var max = date.getMonthDays(m);
-			if (day > max) {
-				date.setDate(max);
-			}
-			date.setMonth(m);
-		};
-		switch (el.navtype) {
-		    case 400:
-			Calendar.removeClass(el, "hilite");
-			var text = Calendar._TT["ABOUT"];
-			if (typeof text != "undefined") {
-				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
-			} else {
-				// FIXME: this should be removed as soon as lang files get updated!
-				text = "Help and about box text is not translated into this language.\n" +
-					"If you know this language and you feel generous please update\n" +
-					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
-					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
-					"Thank you!\n" +
-					"http://dynarch.com/mishoo/calendar.epl\n";
-			}
-			alert(text);
-			return;
-		    case -2:
-			if (year > cal.minYear) {
-				date.setFullYear(year - 1);
-			}
-			break;
-		    case -1:
-			if (mon > 0) {
-				setMonth(mon - 1);
-			} else if (year-- > cal.minYear) {
-				date.setFullYear(year);
-				setMonth(11);
-			}
-			break;
-		    case 1:
-			if (mon < 11) {
-				setMonth(mon + 1);
-			} else if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-				setMonth(0);
-			}
-			break;
-		    case 2:
-			if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-			}
-			break;
-		    case 100:
-			cal.setFirstDayOfWeek(el.fdow);
-			return;
-		    case 50:
-			var range = el._range;
-			var current = el.innerHTML;
-			for (var i = range.length; --i >= 0;)
-				if (range[i] == current)
-					break;
-			if (ev && ev.shiftKey) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-			var newval = range[i];
-			el.innerHTML = newval;
-			cal.onUpdateTime();
-			return;
-		    case 0:
-			// TODAY will bring us here
-			if ((typeof cal.getDateStatus == "function") &&
-			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
-				return false;
-			}
-			break;
-		}
-		if (!date.equalsTo(cal.date)) {
-			cal.setDate(date);
-			newdate = true;
-		} else if (el.navtype == 0)
-			newdate = closing = true;
-	}
-	if (newdate) {
-		ev && cal.callHandler();
-	}
-	if (closing) {
-		Calendar.removeClass(el, "hilite");
-		ev && cal.callCloseHandler();
-	}
-};
-
-// END: CALENDAR STATIC FUNCTIONS
-
-// BEGIN: CALENDAR OBJECT FUNCTIONS
-
-/**
- *  This function creates the calendar inside the given parent.  If _par is
- *  null than it creates a popup calendar inside the BODY element.  If _par is
- *  an element, be it BODY, then it creates a non-popup calendar (still
- *  hidden).  Some properties need to be set before calling this function.
- */
-Calendar.prototype.create = function (_par) {
-	var parent = null;
-	if (! _par) {
-		// default parent is the document body, in which case we create
-		// a popup calendar.
-		parent = document.getElementsByTagName("body")[0];
-		this.isPopup = true;
-	} else {
-		parent = _par;
-		this.isPopup = false;
-	}
-	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
-
-	var table = Calendar.createElement("table");
-	this.table = table;
-	table.cellSpacing = 0;
-	table.cellPadding = 0;
-	table.calendar = this;
-	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
-
-	var div = Calendar.createElement("div");
-	this.element = div;
-	div.className = "calendar";
-	if (this.isPopup) {
-		div.style.position = "absolute";
-		div.style.display = "none";
-	}
-	div.appendChild(table);
-
-	var thead = Calendar.createElement("thead", table);
-	var cell = null;
-	var row = null;
-
-	var cal = this;
-	var hh = function (text, cs, navtype) {
-		cell = Calendar.createElement("td", row);
-		cell.colSpan = cs;
-		cell.className = "button";
-		if (navtype != 0 && Math.abs(navtype) <= 2)
-			cell.className += " nav";
-		Calendar._add_evs(cell);
-		cell.calendar = cal;
-		cell.navtype = navtype;
-		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
-		return cell;
-	};
-
-	row = Calendar.createElement("tr", thead);
-	var title_length = 6;
-	(this.isPopup) && --title_length;
-	(this.weekNumbers) && ++title_length;
-
-	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
-	this.title = hh("", title_length, 300);
-	this.title.className = "title";
-	if (this.isPopup) {
-		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		this.title.style.cursor = "move";
-		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
-	}
-
-	row = Calendar.createElement("tr", thead);
-	row.className = "headrow";
-
-	this._nav_py = hh("&#x00ab;", 1, -2);
-	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
-
-	this._nav_pm = hh("&#x2039;", 1, -1);
-	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
-
-	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
-	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
-
-	this._nav_nm = hh("&#x203a;", 1, 1);
-	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
-
-	this._nav_ny = hh("&#x00bb;", 1, 2);
-	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
-
-	// day names
-	row = Calendar.createElement("tr", thead);
-	row.className = "daynames";
-	if (this.weekNumbers) {
-		cell = Calendar.createElement("td", row);
-		cell.className = "name wn";
-		cell.innerHTML = Calendar._TT["WK"];
-	}
-	for (var i = 7; i > 0; --i) {
-		cell = Calendar.createElement("td", row);
-		if (!i) {
-			cell.navtype = 100;
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
-	this._displayWeekdays();
-
-	var tbody = Calendar.createElement("tbody", table);
-	this.tbody = tbody;
-
-	for (i = 6; i > 0; --i) {
-		row = Calendar.createElement("tr", tbody);
-		if (this.weekNumbers) {
-			cell = Calendar.createElement("td", row);
-		}
-		for (var j = 7; j > 0; --j) {
-			cell = Calendar.createElement("td", row);
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-
-	if (this.showsTime) {
-		row = Calendar.createElement("tr", tbody);
-		row.className = "time";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = 2;
-		cell.innerHTML = Calendar._TT["TIME"] || "&nbsp;";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = this.weekNumbers ? 4 : 3;
-
-		(function(){
-			function makeTimePart(className, init, range_start, range_end) {
-				var part = Calendar.createElement("span", cell);
-				part.className = className;
-				part.innerHTML = init;
-				part.calendar = cal;
-				part.ttip = Calendar._TT["TIME_PART"];
-				part.navtype = 50;
-				part._range = [];
-				if (typeof range_start != "number")
-					part._range = range_start;
-				else {
-					for (var i = range_start; i <= range_end; ++i) {
-						var txt;
-						if (i < 10 && range_end >= 10) txt = '0' + i;
-						else txt = '' + i;
-						part._range[part._range.length] = txt;
-					}
-				}
-				Calendar._add_evs(part);
-				return part;
-			};
-			var hrs = cal.date.getHours();
-			var mins = cal.date.getMinutes();
-			var t12 = !cal.time24;
-			var pm = (hrs > 12);
-			if (t12 && pm) hrs -= 12;
-			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
-			var span = Calendar.createElement("span", cell);
-			span.innerHTML = ":";
-			span.className = "colon";
-			var M = makeTimePart("minute", mins, 0, 59);
-			var AP = null;
-			cell = Calendar.createElement("td", row);
-			cell.className = "time";
-			cell.colSpan = 2;
-			if (t12)
-				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
-			else
-				cell.innerHTML = "&nbsp;";
-
-			cal.onSetTime = function() {
-				var pm, hrs = this.date.getHours(),
-					mins = this.date.getMinutes();
-				if (t12) {
-					pm = (hrs >= 12);
-					if (pm) hrs -= 12;
-					if (hrs == 0) hrs = 12;
-					AP.innerHTML = pm ? "pm" : "am";
-				}
-				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
-				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
-			};
-
-			cal.onUpdateTime = function() {
-				var date = this.date;
-				var h = parseInt(H.innerHTML, 10);
-				if (t12) {
-					if (/pm/i.test(AP.innerHTML) && h < 12)
-						h += 12;
-					else if (/am/i.test(AP.innerHTML) && h == 12)
-						h = 0;
-				}
-				var d = date.getDate();
-				var m = date.getMonth();
-				var y = date.getFullYear();
-				date.setHours(h);
-				date.setMinutes(parseInt(M.innerHTML, 10));
-				date.setFullYear(y);
-				date.setMonth(m);
-				date.setDate(d);
-				this.dateClicked = false;
-				this.callHandler();
-			};
-		})();
-	} else {
-		this.onSetTime = this.onUpdateTime = function() {};
-	}
-
-	var tfoot = Calendar.createElement("tfoot", table);
-
-	row = Calendar.createElement("tr", tfoot);
-	row.className = "footrow";
-
-	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
-	cell.className = "ttip";
-	if (this.isPopup) {
-		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		cell.style.cursor = "move";
-	}
-	this.tooltips = cell;
-
-	div = Calendar.createElement("div", this.element);
-	this.monthsCombo = div;
-	div.className = "combo";
-	for (i = 0; i < Calendar._MN.length; ++i) {
-		var mn = Calendar.createElement("div");
-		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
-		mn.month = i;
-		mn.innerHTML = Calendar._SMN[i];
-		div.appendChild(mn);
-	}
-
-	div = Calendar.createElement("div", this.element);
-	this.yearsCombo = div;
-	div.className = "combo";
-	for (i = 12; i > 0; --i) {
-		var yr = Calendar.createElement("div");
-		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
-		div.appendChild(yr);
-	}
-
-	this._init(this.firstDayOfWeek, this.date);
-	parent.appendChild(this.element);
-};
-
-/** keyboard navigation, only for popup calendars */
-Calendar._keyEvent = function(ev) {
-	var cal = window._dynarch_popupCalendar;
-	if (!cal || cal.multiple)
-		return false;
-	(Calendar.is_ie) && (ev = window.event);
-	var act = (Calendar.is_ie || ev.type == "keypress"),
-		K = ev.keyCode;
-	if (ev.ctrlKey) {
-		switch (K) {
-		    case 37: // KEY left
-			act && Calendar.cellClick(cal._nav_pm);
-			break;
-		    case 38: // KEY up
-			act && Calendar.cellClick(cal._nav_py);
-			break;
-		    case 39: // KEY right
-			act && Calendar.cellClick(cal._nav_nm);
-			break;
-		    case 40: // KEY down
-			act && Calendar.cellClick(cal._nav_ny);
-			break;
-		    default:
-			return false;
-		}
-	} else switch (K) {
-	    case 32: // KEY space (now)
-		Calendar.cellClick(cal._nav_now);
-		break;
-	    case 27: // KEY esc
-		act && cal.callCloseHandler();
-		break;
-	    case 37: // KEY left
-	    case 38: // KEY up
-	    case 39: // KEY right
-	    case 40: // KEY down
-		if (act) {
-			var prev, x, y, ne, el, step;
-			prev = K == 37 || K == 38;
-			step = (K == 37 || K == 39) ? 1 : 7;
-			function setVars() {
-				el = cal.currentDateEl;
-				var p = el.pos;
-				x = p & 15;
-				y = p >> 4;
-				ne = cal.ar_days[y][x];
-			};setVars();
-			function prevMonth() {
-				var date = new Date(cal.date);
-				date.setDate(date.getDate() - step);
-				cal.setDate(date);
-			};
-			function nextMonth() {
-				var date = new Date(cal.date);
-				date.setDate(date.getDate() + step);
-				cal.setDate(date);
-			};
-			while (1) {
-				switch (K) {
-				    case 37: // KEY left
-					if (--x >= 0)
-						ne = cal.ar_days[y][x];
-					else {
-						x = 6;
-						K = 38;
-						continue;
-					}
-					break;
-				    case 38: // KEY up
-					if (--y >= 0)
-						ne = cal.ar_days[y][x];
-					else {
-						prevMonth();
-						setVars();
-					}
-					break;
-				    case 39: // KEY right
-					if (++x < 7)
-						ne = cal.ar_days[y][x];
-					else {
-						x = 0;
-						K = 40;
-						continue;
-					}
-					break;
-				    case 40: // KEY down
-					if (++y < cal.ar_days.length)
-						ne = cal.ar_days[y][x];
-					else {
-						nextMonth();
-						setVars();
-					}
-					break;
-				}
-				break;
-			}
-			if (ne) {
-				if (!ne.disabled)
-					Calendar.cellClick(ne);
-				else if (prev)
-					prevMonth();
-				else
-					nextMonth();
-			}
-		}
-		break;
-	    case 13: // KEY enter
-		if (act)
-			Calendar.cellClick(cal.currentDateEl, ev);
-		break;
-	    default:
-		return false;
-	}
-	return Calendar.stopEvent(ev);
-};
-
-/**
- *  (RE)Initializes the calendar to the given date and firstDayOfWeek
- */
-Calendar.prototype._init = function (firstDayOfWeek, date) {
-	var today = new Date(),
-		TY = today.getFullYear(),
-		TM = today.getMonth(),
-		TD = today.getDate();
-	this.table.style.visibility = "hidden";
-	var year = date.getFullYear();
-	if (year < this.minYear) {
-		year = this.minYear;
-		date.setFullYear(year);
-	} else if (year > this.maxYear) {
-		year = this.maxYear;
-		date.setFullYear(year);
-	}
-	this.firstDayOfWeek = firstDayOfWeek;
-	this.date = new Date(date);
-	var month = date.getMonth();
-	var mday = date.getDate();
-	var no_days = date.getMonthDays();
-
-	// calendar voodoo for computing the first day that would actually be
-	// displayed in the calendar, even if it's from the previous month.
-	// WARNING: this is magic. ;-)
-	date.setDate(1);
-	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
-	if (day1 < 0)
-		day1 += 7;
-	date.setDate(-day1);
-	date.setDate(date.getDate() + 1);
-
-	var row = this.tbody.firstChild;
-	var MN = Calendar._SMN[month];
-	var ar_days = this.ar_days = new Array();
-	var weekend = Calendar._TT["WEEKEND"];
-	var dates = this.multiple ? (this.datesCells = {}) : null;
-	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
-		var cell = row.firstChild;
-		if (this.weekNumbers) {
-			cell.className = "day wn";
-			cell.innerHTML = date.getWeekNumber();
-			cell = cell.nextSibling;
-		}
-		row.className = "daysrow";
-		var hasdays = false, iday, dpos = ar_days[i] = [];
-		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
-			iday = date.getDate();
-			var wday = date.getDay();
-			cell.className = "day";
-			cell.pos = i << 4 | j;
-			dpos[j] = cell;
-			var current_month = (date.getMonth() == month);
-			if (!current_month) {
-				if (this.showsOtherMonths) {
-					cell.className += " othermonth";
-					cell.otherMonth = true;
-				} else {
-					cell.className = "emptycell";
-					cell.innerHTML = "&nbsp;";
-					cell.disabled = true;
-					continue;
-				}
-			} else {
-				cell.otherMonth = false;
-				hasdays = true;
-			}
-			cell.disabled = false;
-			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
-			if (dates)
-				dates[date.print("%Y%m%d")] = cell;
-			if (this.getDateStatus) {
-				var status = this.getDateStatus(date, year, month, iday);
-				if (this.getDateToolTip) {
-					var toolTip = this.getDateToolTip(date, year, month, iday);
-					if (toolTip)
-						cell.title = toolTip;
-				}
-				if (status === true) {
-					cell.className += " disabled";
-					cell.disabled = true;
-				} else {
-					if (/disabled/i.test(status))
-						cell.disabled = true;
-					cell.className += " " + status;
-				}
-			}
-			if (!cell.disabled) {
-				cell.caldate = new Date(date);
-				cell.ttip = "_";
-				if (!this.multiple && current_month
-				    && iday == mday && this.hiliteToday) {
-					cell.className += " selected";
-					this.currentDateEl = cell;
-				}
-				if (date.getFullYear() == TY &&
-				    date.getMonth() == TM &&
-				    iday == TD) {
-					cell.className += " today";
-					cell.ttip += Calendar._TT["PART_TODAY"];
-				}
-				if (weekend.indexOf(wday.toString()) != -1)
-					cell.className += cell.otherMonth ? " oweekend" : " weekend";
-			}
-		}
-		if (!(hasdays || this.showsOtherMonths))
-			row.className = "emptyrow";
-	}
-	this.title.innerHTML = Calendar._MN[month] + ", " + year;
-	this.onSetTime();
-	this.table.style.visibility = "visible";
-	this._initMultipleDates();
-	// PROFILE
-	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
-};
-
-Calendar.prototype._initMultipleDates = function() {
-	if (this.multiple) {
-		for (var i in this.multiple) {
-			var cell = this.datesCells[i];
-			var d = this.multiple[i];
-			if (!d)
-				continue;
-			if (cell)
-				cell.className += " selected";
-		}
-	}
-};
-
-Calendar.prototype._toggleMultipleDate = function(date) {
-	if (this.multiple) {
-		var ds = date.print("%Y%m%d");
-		var cell = this.datesCells[ds];
-		if (cell) {
-			var d = this.multiple[ds];
-			if (!d) {
-				Calendar.addClass(cell, "selected");
-				this.multiple[ds] = date;
-			} else {
-				Calendar.removeClass(cell, "selected");
-				delete this.multiple[ds];
-			}
-		}
-	}
-};
-
-Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
-	this.getDateToolTip = unaryFunction;
-};
-
-/**
- *  Calls _init function above for going to a certain date (but only if the
- *  date is different than the currently selected one).
- */
-Calendar.prototype.setDate = function (date) {
-	if (!date.equalsTo(this.date)) {
-		this._init(this.firstDayOfWeek, date);
-	}
-};
-
-/**
- *  Refreshes the calendar.  Useful if the "disabledHandler" function is
- *  dynamic, meaning that the list of disabled date can change at runtime.
- *  Just * call this function if you think that the list of disabled dates
- *  should * change.
- */
-Calendar.prototype.refresh = function () {
-	this._init(this.firstDayOfWeek, this.date);
-};
-
-/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
-Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
-	this._init(firstDayOfWeek, this.date);
-	this._displayWeekdays();
-};
-
-/**
- *  Allows customization of what dates are enabled.  The "unaryFunction"
- *  parameter must be a function object that receives the date (as a JS Date
- *  object) and returns a boolean value.  If the returned value is true then
- *  the passed date will be marked as disabled.
- */
-Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
-	this.getDateStatus = unaryFunction;
-};
-
-/** Customization of allowed year range for the calendar. */
-Calendar.prototype.setRange = function (a, z) {
-	this.minYear = a;
-	this.maxYear = z;
-};
-
-/** Calls the first user handler (selectedHandler). */
-Calendar.prototype.callHandler = function () {
-	if (this.onSelected) {
-		this.onSelected(this, this.date.print(this.dateFormat));
-	}
-};
-
-/** Calls the second user handler (closeHandler). */
-Calendar.prototype.callCloseHandler = function () {
-	if (this.onClose) {
-		this.onClose(this);
-	}
-	this.hideShowCovered();
-};
-
-/** Removes the calendar object from the DOM tree and destroys it. */
-Calendar.prototype.destroy = function () {
-	var el = this.element.parentNode;
-	el.removeChild(this.element);
-	Calendar._C = null;
-	window._dynarch_popupCalendar = null;
-};
-
-/**
- *  Moves the calendar element to a different section in the DOM tree (changes
- *  its parent).
- */
-Calendar.prototype.reparent = function (new_parent) {
-	var el = this.element;
-	el.parentNode.removeChild(el);
-	new_parent.appendChild(el);
-};
-
-// This gets called when the user presses a mouse button anywhere in the
-// document, if the calendar is shown.  If the click was outside the open
-// calendar this function closes it.
-Calendar._checkCalendar = function(ev) {
-	var calendar = window._dynarch_popupCalendar;
-	if (!calendar) {
-		return false;
-	}
-	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
-	for (; el != null && el != calendar.element; el = el.parentNode);
-	if (el == null) {
-		// calls closeHandler which should hide the calendar.
-		window._dynarch_popupCalendar.callCloseHandler();
-		return Calendar.stopEvent(ev);
-	}
-};
-
-/** Shows the calendar. */
-Calendar.prototype.show = function () {
-	var rows = this.table.getElementsByTagName("tr");
-	for (var i = rows.length; i > 0;) {
-		var row = rows[--i];
-		Calendar.removeClass(row, "rowhilite");
-		var cells = row.getElementsByTagName("td");
-		for (var j = cells.length; j > 0;) {
-			var cell = cells[--j];
-			Calendar.removeClass(cell, "hilite");
-			Calendar.removeClass(cell, "active");
-		}
-	}
-	this.element.style.display = "block";
-	this.hidden = false;
-	if (this.isPopup) {
-		window._dynarch_popupCalendar = this;
-		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.hideShowCovered();
-};
-
-/**
- *  Hides the calendar.  Also removes any "hilite" from the class of any TD
- *  element.
- */
-Calendar.prototype.hide = function () {
-	if (this.isPopup) {
-		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.element.style.display = "none";
-	this.hidden = true;
-	this.hideShowCovered();
-};
-
-/**
- *  Shows the calendar at a given absolute position (beware that, depending on
- *  the calendar element style -- position property -- this might be relative
- *  to the parent's containing rectangle).
- */
-Calendar.prototype.showAt = function (x, y) {
-	var s = this.element.style;
-	s.left = x + "px";
-	s.top = y + "px";
-	this.show();
-};
-
-/** Shows the calendar near a given element. */
-Calendar.prototype.showAtElement = function (el, opts) {
-	var self = this;
-	var p = Calendar.getAbsolutePos(el);
-	if (!opts || typeof opts != "string") {
-		this.showAt(p.x, p.y + el.offsetHeight);
-		return true;
-	}
-	function fixPosition(box) {
-		if (box.x < 0)
-			box.x = 0;
-		if (box.y < 0)
-			box.y = 0;
-		var cp = document.createElement("div");
-		var s = cp.style;
-		s.position = "absolute";
-		s.right = s.bottom = s.width = s.height = "0px";
-		document.body.appendChild(cp);
-		var br = Calendar.getAbsolutePos(cp);
-		document.body.removeChild(cp);
-		if (Calendar.is_ie) {
-			br.y += document.body.scrollTop;
-			br.x += document.body.scrollLeft;
-		} else {
-			br.y += window.scrollY;
-			br.x += window.scrollX;
-		}
-		var tmp = box.x + box.width - br.x;
-		if (tmp > 0) box.x -= tmp;
-		tmp = box.y + box.height - br.y;
-		if (tmp > 0) box.y -= tmp;
-	};
-	this.element.style.display = "block";
-	Calendar.continuation_for_the_fucking_khtml_browser = function() {
-		var w = self.element.offsetWidth;
-		var h = self.element.offsetHeight;
-		self.element.style.display = "none";
-		var valign = opts.substr(0, 1);
-		var halign = "l";
-		if (opts.length > 1) {
-			halign = opts.substr(1, 1);
-		}
-		// vertical alignment
-		switch (valign) {
-		    case "T": p.y -= h; break;
-		    case "B": p.y += el.offsetHeight; break;
-		    case "C": p.y += (el.offsetHeight - h) / 2; break;
-		    case "t": p.y += el.offsetHeight - h; break;
-		    case "b": break; // already there
-		}
-		// horizontal alignment
-		switch (halign) {
-		    case "L": p.x -= w; break;
-		    case "R": p.x += el.offsetWidth; break;
-		    case "C": p.x += (el.offsetWidth - w) / 2; break;
-		    case "l": p.x += el.offsetWidth - w; break;
-		    case "r": break; // already there
-		}
-		p.width = w;
-		p.height = h + 40;
-		self.monthsCombo.style.display = "none";
-		fixPosition(p);
-		self.showAt(p.x, p.y);
-	};
-	if (Calendar.is_khtml)
-		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
-	else
-		Calendar.continuation_for_the_fucking_khtml_browser();
-};
-
-/** Customizes the date format. */
-Calendar.prototype.setDateFormat = function (str) {
-	this.dateFormat = str;
-};
-
-/** Customizes the tooltip date format. */
-Calendar.prototype.setTtDateFormat = function (str) {
-	this.ttDateFormat = str;
-};
-
-/**
- *  Tries to identify the date represented in a string.  If successful it also
- *  calls this.setDate which moves the calendar to the given date.
- */
-Calendar.prototype.parseDate = function(str, fmt) {
-	if (!fmt)
-		fmt = this.dateFormat;
-	this.setDate(Date.parseDate(str, fmt));
-};
-
-Calendar.prototype.hideShowCovered = function () {
-	if (!Calendar.is_ie && !Calendar.is_opera)
-		return;
-	function getVisib(obj){
-		var value = obj.style.visibility;
-		if (!value) {
-			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
-				if (!Calendar.is_khtml)
-					value = document.defaultView.
-						getComputedStyle(obj, "").getPropertyValue("visibility");
-				else
-					value = '';
-			} else if (obj.currentStyle) { // IE
-				value = obj.currentStyle.visibility;
-			} else
-				value = '';
-		}
-		return value;
-	};
-
-	var tags = new Array("applet", "iframe", "select");
-	var el = this.element;
-
-	var p = Calendar.getAbsolutePos(el);
-	var EX1 = p.x;
-	var EX2 = el.offsetWidth + EX1;
-	var EY1 = p.y;
-	var EY2 = el.offsetHeight + EY1;
-
-	for (var k = tags.length; k > 0; ) {
-		var ar = document.getElementsByTagName(tags[--k]);
-		var cc = null;
-
-		for (var i = ar.length; i > 0;) {
-			cc = ar[--i];
-
-			p = Calendar.getAbsolutePos(cc);
-			var CX1 = p.x;
-			var CX2 = cc.offsetWidth + CX1;
-			var CY1 = p.y;
-			var CY2 = cc.offsetHeight + CY1;
-
-			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getVisib(cc);
-				}
-				cc.style.visibility = cc.__msh_save_visibility;
-			} else {
-				if (!cc.__msh_save_visibility) {
-					cc.__msh_save_visibility = getVisib(cc);
-				}
-				cc.style.visibility = "hidden";
-			}
-		}
-	}
-};
-
-/** Internal function; it displays the bar with the names of the weekday. */
-Calendar.prototype._displayWeekdays = function () {
-	var fdow = this.firstDayOfWeek;
-	var cell = this.firstdayname;
-	var weekend = Calendar._TT["WEEKEND"];
-	for (var i = 0; i < 7; ++i) {
-		cell.className = "day name";
-		var realday = (i + fdow) % 7;
-		if (i) {
-			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
-			cell.navtype = 100;
-			cell.calendar = this;
-			cell.fdow = realday;
-			Calendar._add_evs(cell);
-		}
-		if (weekend.indexOf(realday.toString()) != -1) {
-			Calendar.addClass(cell, "weekend");
-		}
-		cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
-		cell = cell.nextSibling;
-	}
-};
-
-/** Internal function.  Hides all combo boxes that might be displayed. */
-Calendar.prototype._hideCombos = function () {
-	this.monthsCombo.style.display = "none";
-	this.yearsCombo.style.display = "none";
-};
-
-/** Internal function.  Starts dragging the element. */
-Calendar.prototype._dragStart = function (ev) {
-	if (this.dragging) {
-		return;
-	}
-	this.dragging = true;
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posY = ev.clientY + window.scrollY;
-		posX = ev.clientX + window.scrollX;
-	}
-	var st = this.element.style;
-	this.xOffs = posX - parseInt(st.left);
-	this.yOffs = posY - parseInt(st.top);
-	with (Calendar) {
-		addEvent(document, "mousemove", calDragIt);
-		addEvent(document, "mouseup", calDragEnd);
-	}
-};
-
-// BEGIN: DATE OBJECT PATCHES
-
-/** Adds the number of days array to the Date object. */
-Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-
-/** Constants used for time computations */
-Date.SECOND = 1000 /* milliseconds */;
-Date.MINUTE = 60 * Date.SECOND;
-Date.HOUR   = 60 * Date.MINUTE;
-Date.DAY    = 24 * Date.HOUR;
-Date.WEEK   =  7 * Date.DAY;
-
-Date.parseDate = function(str, fmt) {
-	var today = new Date();
-	var y = 0;
-	var m = -1;
-	var d = 0;
-	var a = str.split(/\W+/);
-	var b = fmt.match(/%./g);
-	var i = 0, j = 0;
-	var hr = 0;
-	var min = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (!a[i])
-			continue;
-		switch (b[i]) {
-		    case "%d":
-		    case "%e":
-			d = parseInt(a[i], 10);
-			break;
-
-		    case "%m":
-			m = parseInt(a[i], 10) - 1;
-			break;
-
-		    case "%Y":
-		    case "%y":
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-			break;
-
-		    case "%b":
-		    case "%B":
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
-			}
-			break;
-
-		    case "%H":
-		    case "%I":
-		    case "%k":
-		    case "%l":
-			hr = parseInt(a[i], 10);
-			break;
-
-		    case "%P":
-		    case "%p":
-			if (/pm/i.test(a[i]) && hr < 12)
-				hr += 12;
-			else if (/am/i.test(a[i]) && hr >= 12)
-				hr -= 12;
-			break;
-
-		    case "%M":
-			min = parseInt(a[i], 10);
-			break;
-		}
-	}
-	if (isNaN(y)) y = today.getFullYear();
-	if (isNaN(m)) m = today.getMonth();
-	if (isNaN(d)) d = today.getDate();
-	if (isNaN(hr)) hr = today.getHours();
-	if (isNaN(min)) min = today.getMinutes();
-	if (y != 0 && m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	y = 0; m = -1; d = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (a[i].search(/[a-zA-Z]+/) != -1) {
-			var t = -1;
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
-			}
-			if (t != -1) {
-				if (m != -1) {
-					d = m+1;
-				}
-				m = t;
-			}
-		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
-			m = a[i]-1;
-		} else if (parseInt(a[i], 10) > 31 && y == 0) {
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-		} else if (d == 0) {
-			d = a[i];
-		}
-	}
-	if (y == 0)
-		y = today.getFullYear();
-	if (m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	return today;
-};
-
-/** Returns the number of days in the current month */
-Date.prototype.getMonthDays = function(month) {
-	var year = this.getFullYear();
-	if (typeof month == "undefined") {
-		month = this.getMonth();
-	}
-	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
-		return 29;
-	} else {
-		return Date._MD[month];
-	}
-};
-
-/** Returns the number of day in the year. */
-Date.prototype.getDayOfYear = function() {
-	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
-	var time = now - then;
-	return Math.floor(time / Date.DAY);
-};
-
-/** Returns the number of the week in year, as defined in ISO 8601. */
-Date.prototype.getWeekNumber = function() {
-	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var DoW = d.getDay();
-	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
-	var ms = d.valueOf(); // GMT
-	d.setMonth(0);
-	d.setDate(4); // Thu in Week 1
-	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
-};
-
-/** Checks date and time equality */
-Date.prototype.equalsTo = function(date) {
-	return ((this.getFullYear() == date.getFullYear()) &&
-		(this.getMonth() == date.getMonth()) &&
-		(this.getDate() == date.getDate()) &&
-		(this.getHours() == date.getHours()) &&
-		(this.getMinutes() == date.getMinutes()));
-};
-
-/** Set only the year, month, date parts (keep existing time) */
-Date.prototype.setDateOnly = function(date) {
-	var tmp = new Date(date);
-	this.setDate(1);
-	this.setFullYear(tmp.getFullYear());
-	this.setMonth(tmp.getMonth());
-	this.setDate(tmp.getDate());
-};
-
-/** Prints the date in a string according to the given format. */
-Date.prototype.print = function (str) {
-	var m = this.getMonth();
-	var d = this.getDate();
-	var y = this.getFullYear();
-	var wn = this.getWeekNumber();
-	var w = this.getDay();
-	var s = {};
-	var hr = this.getHours();
-	var pm = (hr >= 12);
-	var ir = (pm) ? (hr - 12) : hr;
-	var dy = this.getDayOfYear();
-	if (ir == 0)
-		ir = 12;
-	var min = this.getMinutes();
-	var sec = this.getSeconds();
-	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
-	s["%A"] = Calendar._DN[w]; // full weekday name
-	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
-	s["%B"] = Calendar._MN[m]; // full month name
-	// FIXME: %c : preferred date and time representation for the current locale
-	s["%C"] = 1 + Math.floor(y / 100); // the century number
-	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
-	s["%e"] = d; // the day of the month (range 1 to 31)
-	// FIXME: %D : american date style: %m/%d/%y
-	// FIXME: %E, %F, %G, %g, %h (man strftime)
-	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
-	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
-	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
-	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
-	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
-	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
-	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
-	s["%n"] = "\n";		// a newline character
-	s["%p"] = pm ? "PM" : "AM";
-	s["%P"] = pm ? "pm" : "am";
-	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
-	// FIXME: %R : the time in 24-hour notation %H:%M
-	s["%s"] = Math.floor(this.getTime() / 1000);
-	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
-	s["%t"] = "\t";		// a tab character
-	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
-	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
-	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
-	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
-	// FIXME: %x : preferred date representation for the current locale without the time
-	// FIXME: %X : preferred time representation for the current locale without the date
-	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
-	s["%Y"] = y;		// year with the century
-	s["%%"] = "%";		// a literal '%' character
-
-	var re = /%./g;
-	if (!Calendar.is_ie5 && !Calendar.is_khtml)
-		return str.replace(re, function (par) { return s[par] || par; });
-
-	var a = str.match(re);
-	for (var i = 0; i < a.length; i++) {
-		var tmp = s[a[i]];
-		if (tmp) {
-			re = new RegExp(a[i], 'g');
-			str = str.replace(re, tmp);
-		}
-	}
-
-	return str;
-};
-
-Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
-Date.prototype.setFullYear = function(y) {
-	var d = new Date(this);
-	d.__msh_oldSetFullYear(y);
-	if (d.getMonth() != this.getMonth())
-		this.setDate(28);
-	this.__msh_oldSetFullYear(y);
-};
-
-// END: DATE OBJECT PATCHES
-
-
-// global object that remembers the calendar
-window._dynarch_popupCalendar = null;
+DyCalendar=function(firstDayOfWeek,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.getDateToolTip=null;this.getDateText=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=DyCalendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=DyCalendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.firstDayOfWeek=typeof firstDayOfWeek=="number"?firstDayOfWeek:DyCalendar._FD;this.showsOtherMonths=false;this.dateStr=dateStr;this.ar_days=null;this.showsTime=false;this.time24=true;this.yearStep=2;this.hiliteToday=true;this.multiple=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof DyCalendar._SDN=="undefined"){if(typeof DyCalendar._SDN_len=="undefined")DyCalendar._SDN_len=3;var ar=new Array();for(var i=8;i>0;){ar[--i]=DyCalendar._DN[i].substr(0,DyCalendar._SDN_len)}DyCalendar._SDN=ar;if(typeof DyCalendar._SMN_len=="undefined")DyCalendar._SMN_len=3;ar=new Array();for(var i=12;i>0;){ar[--i]=DyCalendar._MN[i].substr(0,DyCalendar._SMN_len)}DyCalendar._SMN=ar}};DyCalendar._C=null;DyCalendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));DyCalendar.is_ie5=(DyCalendar.is_ie&&/msie 5\.0/i.test(navigator.userAgent));DyCalendar.is_opera=/opera/i.test(navigator.userAgent);DyCalendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);DyCalendar.getAbsolutePos=function(el){var SL=0,ST=0;var is_div=/^div$/i.test(el.tagName);if(is_div&&el.scrollLeft)SL=el.scrollLeft;if(is_div&&el.scrollTop)ST=el.scrollTop;var r={x:el.offsetLeft-SL,y:el.offsetTop-ST};if(el.offsetParent){var tmp=this.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y}return r};DyCalendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement}else if(type=="mouseout"){related=evt.toElement}}while(related){if(related==el){return true}related=related.parentNode}return false};DyCalendar.removeClass=function(el,className){if(!(el&&el.className)){return}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i]}}el.className=ar.join(" ")};DyCalendar.addClass=function(el,className){DyCalendar.removeClass(el,className);el.className+=" "+className};DyCalendar.getElement=function(ev){var f=DyCalendar.is_ie?window.event.srcElement:ev.currentTarget;while(f.nodeType!=1||/^div$/i.test(f.tagName))f=f.parentNode;return f};DyCalendar.getTargetElement=function(ev){var f=DyCalendar.is_ie?window.event.srcElement:ev.target;while(f.nodeType!=1)f=f.parentNode;return f};DyCalendar.stopEvent=function(ev){ev||(ev=window.event);if(DyCalendar.is_ie){ev.cancelBubble=true;ev.returnValue=false}else{ev.preventDefault();ev.stopPropagation()}return false};DyCalendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func)}else if(el.addEventListener){el.addEventListener(evname,func,true)}else{el["on"+evname]=func}};DyCalendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func)}else if(el.removeEventListener){el.removeEventListener(evname,func,true)}else{el["on"+evname]=null}};DyCalendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type)}else{el=document.createElement(type)}if(typeof parent!="undefined"){parent.appendChild(el)}return el};DyCalendar._add_evs=function(el){with(DyCalendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true)}}};DyCalendar.findMonth=function(el){if(typeof el.month!="undefined"){return el}else if(typeof el.parentNode.month!="undefined"){return el.parentNode}return null};DyCalendar.findYear=function(el){if(typeof el.year!="undefined"){return el}else if(typeof el.parentNode.year!="undefined"){return el.parentNode}return null};DyCalendar.showMonthsCombo=function(){var cal=DyCalendar._C;if(!cal){return false}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}if(cal.activeMonth){DyCalendar.removeClass(cal.activeMonth,"active")}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];DyCalendar.addClass(mon,"active");cal.activeMonth=mon;var s=mc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var mcw=mc.offsetWidth;if(typeof mcw=="undefined")mcw=50;s.left=(cd.offsetLeft+cd.offsetWidth-mcw)+"px"}s.top=(cd.offsetTop+cd.offsetHeight)+"px"};DyCalendar.showYearsCombo=function(fwd){var cal=DyCalendar._C;if(!cal){return false}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}if(cal.activeYear){DyCalendar.removeClass(cal.activeYear,"active")}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.innerHTML=Y;yr.year=Y;yr.style.display="block";show=true}else{yr.style.display="none"}yr=yr.nextSibling;Y+=fwd?cal.yearStep:-cal.yearStep}if(show){var s=yc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var ycw=yc.offsetWidth;if(typeof ycw=="undefined")ycw=50;s.left=(cd.offsetLeft+cd.offsetWidth-ycw)+"px"}s.top=(cd.offsetTop+cd.offsetHeight)+"px"}};DyCalendar.tableMouseUp=function(ev){var cal=DyCalendar._C;if(!cal){return false}if(cal.timeout){clearTimeout(cal.timeout)}var el=cal.activeDiv;if(!el){return false}var target=DyCalendar.getTargetElement(ev);ev||(ev=window.event);DyCalendar.removeClass(el,"active");if(target==el||target.parentNode==el){DyCalendar.cellClick(el,ev)}var mon=DyCalendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}else{var year=DyCalendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}}with(DyCalendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev)}};DyCalendar.tableMouseOver=function(ev){var cal=DyCalendar._C;if(!cal){return}var el=cal.activeDiv;var target=DyCalendar.getTargetElement(ev);if(target==el||target.parentNode==el){DyCalendar.addClass(el,"hilite active");DyCalendar.addClass(el.parentNode,"rowhilite")}else{if(typeof el.navtype=="undefined"||(el.navtype!=50&&(el.navtype==0||Math.abs(el.navtype)>2)))DyCalendar.removeClass(el,"active");DyCalendar.removeClass(el,"hilite");DyCalendar.removeClass(el.parentNode,"rowhilite")}ev||(ev=window.event);if(el.navtype==50&&target!=el){var pos=DyCalendar.getAbsolutePos(el);var w=el.offsetWidth;var x=ev.clientX;var dx;var decrease=true;if(x>pos.x+w){dx=x-pos.x-w;decrease=false}else dx=pos.x-x;if(dx<0)dx=0;var range=el._range;var current=el._current;var count=Math.floor(dx/10)%range.length;for(var i=range.length;--i>=0;)if(range[i]==current)break;while(count-->0)if(decrease){if(--i<0)i=range.length-1}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime()}var mon=DyCalendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}DyCalendar.addClass(mon,"hilite");cal.hilitedMonth=mon}else if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}}else{if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}var year=DyCalendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}DyCalendar.addClass(year,"hilite");cal.hilitedYear=year}else if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}}else if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}}return DyCalendar.stopEvent(ev)};DyCalendar.tableMouseDown=function(ev){if(DyCalendar.getTargetElement(ev)==DyCalendar.getElement(ev)){return DyCalendar.stopEvent(ev)}};DyCalendar.calDragIt=function(ev){var cal=DyCalendar._C;if(!(cal&&cal.dragging)){return false}var posX;var posY;if(DyCalendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft}else{posX=ev.pageX;posY=ev.pageY}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return DyCalendar.stopEvent(ev)};DyCalendar.calDragEnd=function(ev){var cal=DyCalendar._C;if(!cal){return false}cal.dragging=false;with(DyCalendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev)}cal.hideShowCovered()};DyCalendar.dayMouseDown=function(ev){var el=DyCalendar.getElement(ev);if(el.disabled){return false}var cal=el.calendar;cal.activeDiv=el;DyCalendar._C=cal;if(el.navtype!=300)with(DyCalendar){if(el.navtype==50){el._current=el.innerHTML;addEvent(document,"mousemove",tableMouseOver)}else addEvent(document,DyCalendar.is_ie5?"mousemove":"mouseover",tableMouseOver);addClass(el,"hilite active");addEvent(document,"mouseup",tableMouseUp)}else if(cal.isPopup){cal._dragStart(ev)}if(el.navtype==-1||el.navtype==1){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout("DyCalendar.showMonthsCombo()",250)}else if(el.navtype==-2||el.navtype==2){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout((el.navtype>0)?"DyCalendar.showYearsCombo(true)":"DyCalendar.showYearsCombo(false)",250)}else{cal.timeout=null}return DyCalendar.stopEvent(ev)};DyCalendar.dayMouseDblClick=function(ev){DyCalendar.cellClick(DyCalendar.getElement(ev),ev||window.event);if(DyCalendar.is_ie){document.selection.empty()}};DyCalendar.dayMouseOver=function(ev){var el=DyCalendar.getElement(ev);if(DyCalendar.isRelated(el,ev)||DyCalendar._C||el.disabled){return false}if(el.ttip){if(el.ttip.substr(0,1)=="_"){el.ttip=el.caldate.print(el.calendar.ttDateFormat)+el.ttip.substr(1)}el.calendar.tooltips.innerHTML=el.ttip}if(el.navtype!=300){DyCalendar.addClass(el,"hilite");if(el.caldate){DyCalendar.addClass(el.parentNode,"rowhilite")}}return DyCalendar.stopEvent(ev)};DyCalendar.dayMouseOut=function(ev){with(DyCalendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled)return false;removeClass(el,"hilite");if(el.caldate)removeClass(el.parentNode,"rowhilite");if(el.calendar)el.calendar.tooltips.innerHTML=_TT["SEL_DATE"];return stopEvent(ev)}};DyCalendar.cellClick=function(el,ev){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){if(cal.currentDateEl){DyCalendar.removeClass(cal.currentDateEl,"selected");DyCalendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el}}cal.date.setDateOnly(el.caldate);date=cal.date;var other_month=!(cal.dateClicked=!el.otherMonth);if(!other_month&&!cal.currentDateEl)cal._toggleMultipleDate(new Date(date));else newdate=!el.disabled;if(other_month)cal._init(cal.firstDayOfWeek,date)}else{if(el.navtype==200){DyCalendar.removeClass(el,"hilite");cal.callCloseHandler();return}date=new Date(cal.date);if(el.navtype==0)date.setDateOnly(new Date());cal.dateClicked=false;var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max)}date.setMonth(m)};switch(el.navtype){case 400:DyCalendar.removeClass(el,"hilite");var text=DyCalendar._TT["ABOUT"];if(typeof text!="undefined"){text+=cal.showsTime?DyCalendar._TT["ABOUT_TIME"]:""}else{text="Help and about box text is not translated into this language.\n"+"If you know this language and you feel generous please update\n"+"the corresponding file in \"lang\" subdir to match calendar-en.js\n"+"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n"+"Thank you!\n"+"http://dynarch.com/mishoo/calendar.epl\n"}alert(text);return;case-2:if(year>cal.minYear){date.setFullYear(year-1)}break;case-1:if(mon>0){setMonth(mon-1)}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11)}break;case 1:if(mon<11){setMonth(mon+1)}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0)}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1)}break;case 100:cal.setFirstDayOfWeek(el.fdow);return;case 50:var range=el._range;var current=el.innerHTML;for(var i=range.length;--i>=0;)if(range[i]==current)break;if(ev&&ev.shiftKey){if(--i<0)i=range.length-1}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime();return;case 0:if((typeof cal.getDateStatus=="function")&&cal.getDateStatus(date,date.getFullYear(),date.getMonth(),date.getDate())){return false}break}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true}else if(el.navtype==0)newdate=closing=true}if(newdate){ev&&cal.callHandler()}if(closing){DyCalendar.removeClass(el,"hilite");ev&&cal.callCloseHandler()}};DyCalendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true}else{parent=_par;this.isPopup=false}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=DyCalendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;DyCalendar.addEvent(table,"mousedown",DyCalendar.tableMouseDown);var div=DyCalendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none"}div.appendChild(table);var thead=DyCalendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=DyCalendar.createElement("td",row);cell.colSpan=cs;cell.className="button";if(navtype!=0&&Math.abs(navtype)<=2)cell.className+=" nav";DyCalendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;cell.innerHTML="<div unselectable='on'>"+text+"</div>";return cell};row=DyCalendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("?",1,400).ttip=DyCalendar._TT["INFO"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=DyCalendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=DyCalendar._TT["CLOSE"]}row=DyCalendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=DyCalendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=DyCalendar._TT["PREV_MONTH"];this._nav_now=hh(DyCalendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=DyCalendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=DyCalendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=DyCalendar._TT["NEXT_YEAR"];row=DyCalendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=DyCalendar.createElement("td",row);cell.className="name wn";cell.innerHTML=DyCalendar._TT["WK"]}for(var i=7;i>0;--i){cell=DyCalendar.createElement("td",row);if(!i){cell.navtype=100;cell.calendar=this;DyCalendar._add_evs(cell)}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=DyCalendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=DyCalendar.createElement("tr",tbody);if(this.weekNumbers){cell=DyCalendar.createElement("td",row)}for(var j=7;j>0;--j){cell=DyCalendar.createElement("td",row);cell.calendar=this;DyCalendar._add_evs(cell)}}if(this.showsTime){row=DyCalendar.createElement("tr",tbody);row.className="time";cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=2;cell.innerHTML=DyCalendar._TT["TIME"]||"&nbsp;";cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=this.weekNumbers?4:3;(function(){function makeTimePart(className,init,range_start,range_end){var part=DyCalendar.createElement("span",cell);part.className=className;part.innerHTML=init;part.calendar=cal;part.ttip=DyCalendar._TT["TIME_PART"];part.navtype=50;part._range=[];if(typeof range_start!="number")part._range=range_start;else{for(var i=range_start;i<=range_end;++i){var txt;if(i<10&&range_end>=10)txt='0'+i;else txt=''+i;part._range[part._range.length]=txt}}DyCalendar._add_evs(part);return part};var hrs=cal.date.getHours();var mins=cal.date.getMinutes();var t12=!cal.time24;var pm=(hrs>12);if(t12&&pm)hrs-=12;var H=makeTimePart("hour",hrs,t12?1:0,t12?12:23);var span=DyCalendar.createElement("span",cell);span.innerHTML=":";span.className="colon";var M=makeTimePart("minute",mins,0,59);var AP=null;cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=2;if(t12)AP=makeTimePart("ampm",pm?"pm":"am",["am","pm"]);else cell.innerHTML="&nbsp;";cal.onSetTime=function(){var pm,hrs=this.date.getHours(),mins=this.date.getMinutes();if(t12){pm=(hrs>=12);if(pm)hrs-=12;if(hrs==0)hrs=12;AP.innerHTML=pm?"pm":"am"}H.innerHTML=(hrs<10)?("0"+hrs):hrs;M.innerHTML=(mins<10)?("0"+mins):mins};cal.onUpdateTime=function(){var date=this.date;var h=parseInt(H.innerHTML,10);if(t12){if(/pm/i.test(AP.innerHTML)&&h<12)h+=12;else if(/am/i.test(AP.innerHTML)&&h==12)h=0}var d=date.getDate();var m=date.getMonth();var y=date.getFullYear();date.setHours(h);date.setMinutes(parseInt(M.innerHTML,10));date.setFullYear(y);date.setMonth(m);date.setDate(d);this.dateClicked=false;this.callHandler()}})()}else{this.onSetTime=this.onUpdateTime=function(){}}var tfoot=DyCalendar.createElement("tfoot",table);row=DyCalendar.createElement("tr",tfoot);row.className="footrow";cell=hh(DyCalendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=DyCalendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move"}this.tooltips=cell;div=DyCalendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<DyCalendar._MN.length;++i){var mn=DyCalendar.createElement("div");mn.className=DyCalendar.is_ie?"label-IEfix":"label";mn.month=i;mn.innerHTML=DyCalendar._SMN[i];div.appendChild(mn)}div=DyCalendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=DyCalendar.createElement("div");yr.className=DyCalendar.is_ie?"label-IEfix":"label";div.appendChild(yr)}this._init(this.firstDayOfWeek,this.date);parent.appendChild(this.element)};DyCalendar._keyEvent=function(ev){var cal=window._dynarch_popupDyCalendar;if(!cal||cal.multiple)return false;(DyCalendar.is_ie)&&(ev=window.event);var act=(DyCalendar.is_ie||ev.type=="keypress"),K=ev.keyCode;if(ev.ctrlKey){switch(K){case 37:act&&DyCalendar.cellClick(cal._nav_pm);break;case 38:act&&DyCalendar.cellClick(cal._nav_py);break;case 39:act&&DyCalendar.cellClick(cal._nav_nm);break;case 40:act&&DyCalendar.cellClick(cal._nav_ny);break;default:return false}}else switch(K){case 32:DyCalendar.cellClick(cal._nav_now);break;case 27:act&&cal.callCloseHandler();break;case 37:case 38:case 39:case 40:if(act){var prev,x,y,ne,el,step;prev=K==37||K==38;step=(K==37||K==39)?1:7;function setVars(){el=cal.currentDateEl;var p=el.pos;x=p&15;y=p>>4;ne=cal.ar_days[y][x]};setVars();function prevMonth(){var date=new Date(cal.date);date.setDate(date.getDate()-step);cal.setDate(date)};function nextMonth(){var date=new Date(cal.date);date.setDate(date.getDate()+step);cal.setDate(date)};while(1){switch(K){case 37:if(--x>=0)ne=cal.ar_days[y][x];else{x=6;K=38;continue}break;case 38:if(--y>=0)ne=cal.ar_days[y][x];else{prevMonth();setVars()}break;case 39:if(++x<7)ne=cal.ar_days[y][x];else{x=0;K=40;continue}break;case 40:if(++y<cal.ar_days.length)ne=cal.ar_days[y][x];else{nextMonth();setVars()}break}break}if(ne){if(!ne.disabled)DyCalendar.cellClick(ne);else if(prev)prevMonth();else nextMonth()}}break;case 13:if(act)DyCalendar.cellClick(cal.currentDateEl,ev);break;default:return false}return DyCalendar.stopEvent(ev)};DyCalendar.prototype._init=function(firstDayOfWeek,date){var today=new Date(),TY=today.getFullYear(),TM=today.getMonth(),TD=today.getDate();this.table.style.visibility="hidden";var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year)}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year)}this.firstDayOfWeek=firstDayOfWeek;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var day1=(date.getDay()-this.firstDayOfWeek)%7;if(day1<0)day1+=7;date.setDate(-day1);date.setDate(date.getDate()+1);var row=this.tbody.firstChild;var MN=DyCalendar._SMN[month];var ar_days=this.ar_days=new Array();var weekend=DyCalendar._TT["WEEKEND"];var dates=this.multiple?(this.datesCells={}):null;for(var i=0;i<6;++i,row=row.nextSibling){var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.innerHTML=date.getWeekNumber();cell=cell.nextSibling}row.className="daysrow";var hasdays=false,iday,dpos=ar_days[i]=[];for(var j=0;j<7;++j,cell=cell.nextSibling,date.setDate(iday+1)){iday=date.getDate();var wday=date.getDay();cell.className="day";cell.pos=i<<4|j;dpos[j]=cell;var current_month=(date.getMonth()==month);if(!current_month){if(this.showsOtherMonths){cell.className+=" othermonth";cell.otherMonth=true}else{cell.className="emptycell";cell.innerHTML="&nbsp;";cell.disabled=true;continue}}else{cell.otherMonth=false;hasdays=true}cell.disabled=false;cell.innerHTML=this.getDateText?this.getDateText(date,iday):iday;if(dates)dates[date.print("%Y%m%d")]=cell;if(this.getDateStatus){var status=this.getDateStatus(date,year,month,iday);if(this.getDateToolTip){var toolTip=this.getDateToolTip(date,year,month,iday);if(toolTip)cell.title=toolTip}if(status===true){cell.className+=" disabled";cell.disabled=true}else{if(/disabled/i.test(status))cell.disabled=true;cell.className+=" "+status}}if(!cell.disabled){cell.caldate=new Date(date);cell.ttip="_";if(!this.multiple&&current_month&&iday==mday&&this.hiliteToday){cell.className+=" selected";this.currentDateEl=cell}if(date.getFullYear()==TY&&date.getMonth()==TM&&iday==TD){cell.className+=" today";cell.ttip+=DyCalendar._TT["PART_TODAY"]}if(weekend.indexOf(wday.toString())!=-1)cell.className+=cell.otherMonth?" oweekend":" weekend"}}if(!(hasdays||this.showsOtherMonths))row.className="emptyrow"}this.title.innerHTML=DyCalendar._MN[month]+", "+year;this.onSetTime();this.table.style.visibility="visible";this._initMultipleDates()};DyCalendar.prototype._initMultipleDates=function(){if(this.multiple){for(var i in this.multiple){var cell=this.datesCells[i];var d=this.multiple[i];if(!d)continue;if(cell)cell.className+=" selected"}}};DyCalendar.prototype._toggleMultipleDate=function(date){if(this.multiple){var ds=date.print("%Y%m%d");var cell=this.datesCells[ds];if(cell){var d=this.multiple[ds];if(!d){DyCalendar.addClass(cell,"selected");this.multiple[ds]=date}else{DyCalendar.removeClass(cell,"selected");delete this.multiple[ds]}}}};DyCalendar.prototype.setDateToolTipHandler=function(unaryFunction){this.getDateToolTip=unaryFunction};DyCalendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.firstDayOfWeek,date)}};DyCalendar.prototype.refresh=function(){this._init(this.firstDayOfWeek,this.date)};DyCalendar.prototype.setFirstDayOfWeek=function(firstDayOfWeek){this._init(firstDayOfWeek,this.date);this._displayWeekdays()};DyCalendar.prototype.setDateStatusHandler=DyCalendar.prototype.setDisabledHandler=function(unaryFunction){this.getDateStatus=unaryFunction};DyCalendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z};DyCalendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat))}};DyCalendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this)}this.hideShowCovered()};DyCalendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);DyCalendar._C=null;window._dynarch_popupDyCalendar=null};DyCalendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el)};DyCalendar._checkDyCalendar=function(ev){var calendar=window._dynarch_popupDyCalendar;if(!calendar){return false}var el=DyCalendar.is_ie?DyCalendar.getElement(ev):DyCalendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window._dynarch_popupDyCalendar.callCloseHandler();return DyCalendar.stopEvent(ev)}};DyCalendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];DyCalendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];DyCalendar.removeClass(cell,"hilite");DyCalendar.removeClass(cell,"active")}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window._dynarch_popupDyCalendar=this;DyCalendar.addEvent(document,"keydown",DyCalendar._keyEvent);DyCalendar.addEvent(document,"keypress",DyCalendar._keyEvent);DyCalendar.addEvent(document,"mousedown",DyCalendar._checkDyCalendar)}this.hideShowCovered()};DyCalendar.prototype.hide=function(){if(this.isPopup){DyCalendar.removeEvent(document,"keydown",DyCalendar._keyEvent);DyCalendar.removeEvent(document,"keypress",DyCalendar._keyEvent);DyCalendar.removeEvent(document,"mousedown",DyCalendar._checkDyCalendar)}this.element.style.display="none";this.hidden=true;this.hideShowCovered()};DyCalendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show()};DyCalendar.prototype.showAtElement=function(el,opts){var self=this;var p=DyCalendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true}function fixPosition(box){if(box.x<0)box.x=0;if(box.y<0)box.y=0;var cp=document.createElement("div");var s=cp.style;s.position="absolute";s.right=s.bottom=s.width=s.height="0px";document.body.appendChild(cp);var br=DyCalendar.getAbsolutePos(cp);document.body.removeChild(cp);if(DyCalendar.is_ie){br.y+=document.body.scrollTop;br.x+=document.body.scrollLeft}else{br.y+=window.scrollY;br.x+=window.scrollX}var tmp=box.x+box.width-br.x;if(tmp>0)box.x-=tmp;tmp=box.y+box.height-br.y;if(tmp>0)box.y-=tmp};this.element.style.display="block";DyCalendar.continuation_for_the_fucking_khtml_browser=function(){var w=self.element.offsetWidth;var h=self.element.offsetHeight;self.element.style.display="none";var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1)}switch(valign){case"T":p.y-=h;break;case"B":p.y+=el.offsetHeight;break;case"C":p.y+=(el.offsetHeight-h)/2;break;case"t":p.y+=el.offsetHeight-h;break;case"b":break}switch(halign){case"L":p.x-=w;break;case"R":p.x+=el.offsetWidth;break;case"C":p.x+=(el.offsetWidth-w)/2;break;case"l":p.x+=el.offsetWidth-w;break;case"r":break}p.width=w;p.height=h+40;self.monthsCombo.style.display="none";fixPosition(p);self.showAt(p.x,p.y)};if(DyCalendar.is_khtml)setTimeout("DyCalendar.continuation_for_the_fucking_khtml_browser()",10);else DyCalendar.continuation_for_the_fucking_khtml_browser()};DyCalendar.prototype.setDateFormat=function(str){this.dateFormat=str};DyCalendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str};DyCalendar.prototype.parseDate=function(str,fmt){if(!fmt)fmt=this.dateFormat;this.setDate(Date.parseDate(str,fmt))};DyCalendar.prototype.hideShowCovered=function(){if(!DyCalendar.is_ie&&!DyCalendar.is_opera)return;function getVisib(obj){var value=obj.style.visibility;if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){if(!DyCalendar.is_khtml)value=document.defaultView.getComputedStyle(obj,"").getPropertyValue("visibility");else value=''}else if(obj.currentStyle){value=obj.currentStyle.visibility}else value=''}return value};var tags=new Array("applet","iframe","select");var el=this.element;var p=DyCalendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=DyCalendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(this.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc)}cc.style.visibility=cc.__msh_save_visibility}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc)}cc.style.visibility="hidden"}}}};DyCalendar.prototype._displayWeekdays=function(){var fdow=this.firstDayOfWeek;var cell=this.firstdayname;var weekend=DyCalendar._TT["WEEKEND"];for(var i=0;i<7;++i){cell.className="day name";var realday=(i+fdow)%7;if(i){cell.ttip=DyCalendar._TT["DAY_FIRST"].replace("%s",DyCalendar._DN[realday]);cell.navtype=100;cell.calendar=this;cell.fdow=realday;DyCalendar._add_evs(cell)}if(weekend.indexOf(realday.toString())!=-1){DyCalendar.addClass(cell,"weekend")}cell.innerHTML=DyCalendar._SDN[(i+fdow)%7];cell=cell.nextSibling}};DyCalendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none"};DyCalendar.prototype._dragStart=function(ev){if(this.dragging){return}this.dragging=true;var posX;var posY;if(DyCalendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(DyCalendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseup",calDragEnd)}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.parseDate=function(str,fmt){var today=new Date();var y=0;var m=-1;var d=0;var a=str.split(/\W+/);var b=fmt.match(/%./g);var i=0,j=0;var hr=0;var min=0;for(i=0;i<a.length;++i){if(!a[i])continue;switch(b[i]){case"%d":case"%e":d=parseInt(a[i],10);break;case"%m":m=parseInt(a[i],10)-1;break;case"%Y":case"%y":y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);break;case"%b":case"%B":for(j=0;j<12;++j){if(DyCalendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break}}break;case"%H":case"%I":case"%k":case"%l":hr=parseInt(a[i],10);break;case"%P":case"%p":if(/pm/i.test(a[i])&&hr<12)hr+=12;else if(/am/i.test(a[i])&&hr>=12)hr-=12;break;case"%M":min=parseInt(a[i],10);break}}if(isNaN(y))y=today.getFullYear();if(isNaN(m))m=today.getMonth();if(isNaN(d))d=today.getDate();if(isNaN(hr))hr=today.getHours();if(isNaN(min))min=today.getMinutes();if(y!=0&&m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(DyCalendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break}}if(t!=-1){if(m!=-1){d=m+1}m=t}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000)}else if(d==0){d=a[i]}}if(y==0)y=today.getFullYear();if(m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);return today};Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth()}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29}else{return Date._MD[month]}};Date.prototype.getDayOfYear=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,0,0,0,0);var time=now-then;return Math.floor(time/Date.DAY)};Date.prototype.getWeekNumber=function(){var d=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var DoW=d.getDay();d.setDate(d.getDate()-(DoW+6)%7+3);var ms=d.valueOf();d.setMonth(0);d.setDate(4);return Math.round((ms-d.valueOf())/(7*864e5))+1};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate())&&(this.getHours()==date.getHours())&&(this.getMinutes()==date.getMinutes()))};Date.prototype.setDateOnly=function(date){var tmp=new Date(date);this.setDate(1);this.setFullYear(tmp.getFullYear());this.setMonth(tmp.getMonth());this.setDate(tmp.getDate())};Date.prototype.print=function(str){var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s={};var hr=this.getHours();var pm=(hr>=12);var ir=(pm)?(hr-12):hr;var dy=this.getDayOfYear();if(ir==0)ir=12;var min=this.getMinutes();var sec=this.getSeconds();s["%a"]=DyCalendar._SDN[w];s["%A"]=DyCalendar._DN[w];s["%b"]=DyCalendar._SMN[m];s["%B"]=DyCalendar._MN[m];s["%C"]=1+Math.floor(y/100);s["%d"]=(d<10)?("0"+d):d;s["%e"]=d;s["%H"]=(hr<10)?("0"+hr):hr;s["%I"]=(ir<10)?("0"+ir):ir;s["%j"]=(dy<100)?((dy<10)?("00"+dy):("0"+dy)):dy;s["%k"]=hr;s["%l"]=ir;s["%m"]=(m<9)?("0"+(1+m)):(1+m);s["%M"]=(min<10)?("0"+min):min;s["%n"]="\n";s["%p"]=pm?"PM":"AM";s["%P"]=pm?"pm":"am";s["%s"]=Math.floor(this.getTime()/1000);s["%S"]=(sec<10)?("0"+sec):sec;s["%t"]="\t";s["%U"]=s["%W"]=s["%V"]=(wn<10)?("0"+wn):wn;s["%u"]=w+1;s["%w"]=w;s["%y"]=(''+y).substr(2,2);s["%Y"]=y;s["%%"]="%";var re=/%./g;if(!DyCalendar.is_ie5&&!DyCalendar.is_khtml)return str.replace(re,function(par){return s[par]||par});var a=str.match(re);for(var i=0;i<a.length;i++){var tmp=s[a[i]];if(tmp){re=new RegExp(a[i],'g');str=str.replace(re,tmp)}}return str};Date.prototype.__msh_oldSetFullYear=Date.prototype.setFullYear;Date.prototype.setFullYear=function(y){var d=new Date(this);d.__msh_oldSetFullYear(y);if(d.getMonth()!=this.getMonth())this.setDate(28);this.__msh_oldSetFullYear(y)};window._dynarch_popupDyCalendar=null;
\ No newline at end of file
diff --git a/modules/board/skins/xe_board/extra_var_form.html b/modules/board/skins/xe_board/extra_var_form.html
index 5e559b9d7..155320543 100644
--- a/modules/board/skins/xe_board/extra_var_form.html
+++ b/modules/board/skins/xe_board/extra_var_form.html
@@ -69,7 +69,7 @@
     <div class="display_date" id="str_{$val->column_name}">{zdate($val->value,"Y-m-d")}</div>
 
     <script type="text/javascript">
-        Calendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
+        DyCalendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
     </script>
 <!--@end-->
 
diff --git a/modules/board/skins/xe_guestbook/extra_var_form.html b/modules/board/skins/xe_guestbook/extra_var_form.html
index c2139bcd4..e65333346 100644
--- a/modules/board/skins/xe_guestbook/extra_var_form.html
+++ b/modules/board/skins/xe_guestbook/extra_var_form.html
@@ -69,7 +69,7 @@
     <div class="display_date" id="str_{$val->column_name}">{zdate($val->value,"Y-m-d")}</div>
 
     <script type="text/javascript">
-        Calendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
+        DyCalendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
     </script>
 <!--@end-->
 
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html
index 7934e27e6..1141c1843 100644
--- a/modules/counter/tpl/index.html
+++ b/modules/counter/tpl/index.html
@@ -39,7 +39,7 @@
             <span id="str_selected_date">{zdate($selected_date, "Y-m-d")}</span> <span class="vr">|</span> 
             <img src="./images/buttonCalendar.gif" alt="calendar" width="16" height="13" id="trigger_calendar" />
             <script type="text/javascript">
-                Calendar.setup( { firstDay : 0, inputField : "selected_date", ifFormat : "%Y%m%d", displayArea : "str_selected_date", daFormat : "%Y-%m-%d" , button : "trigger_calendar", onClose: moveDate } );
+                DyCalendar.setup( { firstDay : 0, inputField : "selected_date", ifFormat : "%Y%m%d", displayArea : "str_selected_date", daFormat : "%Y-%m-%d" , button : "trigger_calendar", onClose: moveDate } );
             </script>
         </th>
         <td>Visitor : <strong>{number_format($selected_day_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($selected_day_counter->pageview)}</strong></td>
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 0033bd2f6..a299c6eb2 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -39,7 +39,7 @@
             <td>
                 <div class="display_date" id="display_date">{date("Y-m-d",time()+60*60*24*30)}</div>
                 <script type="text/javascript">
-                    Calendar.setup( { firstDay : 0, inputField : "stop_date", ifFormat : "%Y%m%d", displayArea : "display_date", daFormat : "%Y-%m-%d"});
+                    DyCalendar.setup( { firstDay : 0, inputField : "stop_date", ifFormat : "%Y%m%d", displayArea : "display_date", daFormat : "%Y-%m-%d"});
                 </script>
             </td>
         </tr>
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 00c71c7fb..6d4c2996b 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -127,7 +127,7 @@
             <p>{$lang->about_birthday}</p>
 
             <script type="text/javascript">
-                Calendar.setup( { firstDay : 0, inputField : "date_birthday", ifFormat : "%Y%m%d", displayArea : "str_birthday", daFormat : "%Y-%m-%d" } );
+                DyCalendar.setup( { firstDay : 0, inputField : "date_birthday", ifFormat : "%Y%m%d", displayArea : "str_birthday", daFormat : "%Y-%m-%d" } );
             </script>
         </td>
     </tr>
@@ -232,7 +232,7 @@
                 <div class="display_date" id="str_{$val->column_name}">{zdate($val->value,"Y-m-d")}</div>
 
                 <script type="text/javascript">
-                    Calendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
+                    DyCalendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
                 </script>
 
             <!--@end-->
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 65c63749c..041dd4018 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -99,7 +99,7 @@
     </table>
 
     <script type="text/javascript">
-        Calendar.setup( { firstDay : 0, inputField : "date_birthday", ifFormat : "%Y%m%d", displayArea : "str_birthday", daFormat : "%Y-%m-%d"});
+        DyCalendar.setup( { firstDay : 0, inputField : "date_birthday", ifFormat : "%Y%m%d", displayArea : "str_birthday", daFormat : "%Y-%m-%d"});
     </script>
 
     <!--@if($extend_form_list)-->
@@ -193,7 +193,7 @@
                 <div class="display_date" id="str_{$val->column_name}">{zdate($val->value,"Y-m-d")}</div>
 
                 <script type="text/javascript">
-                    Calendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
+                    DyCalendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
                 </script>
             <!--@end-->
 
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index f27dc624e..d9b6ee69f 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -83,7 +83,7 @@
             <p>{$lang->about_birthday}</p>
 
             <script type="text/javascript">
-                Calendar.setup( { firstDay : 0, inputField : "date_birthday", ifFormat : "%Y%m%d", displayArea : "str_birthday", daFormat : "%Y-%m-%d" } );
+                DyCalendar.setup( { firstDay : 0, inputField : "date_birthday", ifFormat : "%Y%m%d", displayArea : "str_birthday", daFormat : "%Y-%m-%d" } );
             </script>
         </td>
     </tr>
@@ -124,7 +124,7 @@
             <input type="hidden" name="limit_date" id="date_limit_date" value="{$member_info->limit_date}" />
             <div id="str_limit_date" class="display_date" >{zdate($member_info->limit_date,"Y-m-d")}</div>
             <script type="text/javascript">
-                Calendar.setup( { firstDay : 0, inputField : "date_limit_date", ifFormat : "%Y%m%d", displayArea : "str_limit_date", daFormat : "%Y-%m-%d" } );
+                DyCalendar.setup( { firstDay : 0, inputField : "date_limit_date", ifFormat : "%Y%m%d", displayArea : "str_limit_date", daFormat : "%Y-%m-%d" } );
             </script>
             <p class="clear">{$lang->about_limit_date}</p>
         </td>
@@ -243,7 +243,7 @@
                 <div class="display_date" id="str_{$val->column_name}">{zdate($val->value,"Y-m-d")}</div>
 
                 <script type="text/javascript">
-                    Calendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
+                    DyCalendar.setup( { firstDay : 0, inputField : "date_{$val->column_name}", ifFormat : "%Y%m%d", displayArea : "str_{$val->column_name}", daFormat : "%Y-%m-%d"});
                 </script>
 
 

From 06221275d5e4a1c1e8d03768377d884e4e01055c Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Sun, 11 May 2008 16:29:59 +0000
Subject: [PATCH 088/111] =?UTF-8?q?common/lang/ge.lang.php=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=95=BD=EA=B0=84=20=EC=88=98=EC=A0=95=ED=9B=84=20?=
 =?UTF-8?q?=EC=BB=A4=EB=B0=8B?=
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@4186 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/ge.lang.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
index baabd0133..48bf3a5f1 100644
--- a/common/lang/ge.lang.php
+++ b/common/lang/ge.lang.php
@@ -16,14 +16,14 @@
     $lang->cmd_list = 'US -';
     $lang->cmd_prev = 'Zurück';
     $lang->cmd_next = 'Nächster';
-    // 여기에서부터 번역 시작필요..
-	$lang->cmd_send_trackback = 'Send Trackback';
-    $lang->cmd_registration = $lang->cmd_submit = 'Submit';
-    $lang->cmd_comment_registration = 'Add Comment';
-    $lang->cmd_insert = 'Insert';
-    $lang->cmd_save = 'Save';
-    $lang->cmd_load = 'Load';
+	$lang->cmd_send_trackback = 'Trackback senden';
+    $lang->cmd_registration = $lang->cmd_submit = 'Übermitteln';
+    $lang->cmd_comment_registration = 'Kommentar hinzufügen';
+    $lang->cmd_insert = 'Legen Sie';
+    $lang->cmd_save = 'Sichern';
+    $lang->cmd_load = 'Laden';
     $lang->cmd_input = 'Input';
+	// 여기에서부터 번역 시작필요..
     $lang->cmd_search = 'Search';
     $lang->cmd_cancel = 'Cancel';
     $lang->cmd_back = 'Go Back';

From 7f23f89915aa5d5e9d6182a2c5f99c25ee71133d Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 12 May 2008 03:58:07 +0000
Subject: [PATCH 089/111] =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=9A=A9=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=96=B8?=
 =?UTF-8?q?=EC=96=B4=ED=8C=A9=20=EC=B6=94=EA=B0=80=20by=20bradly1?=
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@4187 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/calendar-es.js | 133 +++++++++++++++++++++++++++++++++++++++
 common/js/calendar-ge.js | 129 +++++++++++++++++++++++++++++++++++++
 common/js/calendar-ru.js | 127 +++++++++++++++++++++++++++++++++++++
 3 files changed, 389 insertions(+)
 create mode 100644 common/js/calendar-es.js
 create mode 100644 common/js/calendar-ge.js
 create mode 100644 common/js/calendar-ru.js

diff --git a/common/js/calendar-es.js b/common/js/calendar-es.js
new file mode 100644
index 000000000..6290b6092
--- /dev/null
+++ b/common/js/calendar-es.js
@@ -0,0 +1,133 @@
+// ** I18N
+
+// DyCalendar KO language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation: Bradly1, <bradly1@paran.com>
+// Encoding: UTF-8
+// lang : es
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+
+DyCalendar._DN = new Array
+("Domingo",
+ "Lunes",
+ "Martes",
+ "Miércoles",
+ "Jueves",
+ "Viernes",
+ "Sábado",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   DyCalendar._SDN_len = N; // short day name length
+//   DyCalendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+DyCalendar._SDN = new Array
+("Domingo",
+ "Lunes",
+ "Martes",
+ "Miércoles",
+ "Jueves",
+ "Viernes",
+ "Sábado",
+ "Domingo");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+DyCalendar._FD = 0;
+
+// full month names
+DyCalendar._MN = new Array
+("Enero",
+ "Febrero",
+ "Marzo",
+ "Abril",
+ "Mayo",
+ "Junio",
+ "Julio",
+ "Agosto",
+ "Septiembre",
+ "Octubre",
+ "Noviembre",
+ "Diciembre");
+
+// short month names
+DyCalendar._SMN = new Array
+("Enero",
+ "Febrero",
+ "Marzo",
+ "Abril",
+ "Mayo",
+ "Junio",
+ "Julio",
+ "Agosto",
+ "Septiembre",
+ "Octubre",
+ "Noviembre",
+ "Diciembre");
+
+// tooltips
+DyCalendar._TT = {};
+DyCalendar._TT["INFO"] = "Sobre el calendario";
+
+DyCalendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"\n"+
+"최신 버전을 받으시려면 http://www.dynarch.com/projects/calendar/ 에 방문하세요\n" +
+"\n"+
+"GNU LGPL 라이센스로 배포됩니다. \n"+
+"라이센스에 대한 자세한 내용은 http://gnu.org/licenses/lgpl.html 을 읽으세요." +
+"\n\n" +
+"날짜 선택:\n" +
+"- 연도를 선택하려면 \xab, \xbb 버튼을 사용합니다\n" +
+"- 달을 선택하려면 " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " 버튼을 누르세요\n" +
+"- 계속 누르고 있으면 위 값들을 빠르게 선택하실 수 있습니다.";
+DyCalendar._TT["ABOUT_TIME"] = "\n\n" +
+"시간 선택:\n" +
+"- 마우스로 누르면 시간이 증가합니다\n" +
+"- Shift 키와 함께 누르면 감소합니다\n" +
+"- 누른 상태에서 마우스를 움직이면 좀 더 빠르게 값이 변합니다.\n";
+
+DyCalendar._TT["PREV_YEAR"] = "Prev. año (mantener para menu)";
+DyCalendar._TT["PREV_MONTH"] = "Prev. mes (mantener para menu)";
+DyCalendar._TT["GO_TODAY"] = "Ir Hoy";
+DyCalendar._TT["NEXT_MONTH"] = "El mes próximo (mantener para menu)";
+DyCalendar._TT["NEXT_YEAR"] = "El año que viene (mantener para menu)";
+DyCalendar._TT["SEL_DATE"] = "Seleccionar fecha";
+DyCalendar._TT["DRAG_TO_MOVE"] = "Arrastra para mover";
+DyCalendar._TT["PART_TODAY"] = " (hoy)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+DyCalendar._TT["DAY_FIRST"] = "Mostrar% s primero";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+DyCalendar._TT["WEEKEND"] = "0,6";
+
+DyCalendar._TT["CLOSE"] = "Cerrar";
+DyCalendar._TT["TODAY"] = "Hoy";
+DyCalendar._TT["TIME_PART"] = "(Shift-) Haga clic o arrastre para cambiar el valor";
+
+// date formats
+DyCalendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+DyCalendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+DyCalendar._TT["WK"] = "wk";
+DyCalendar._TT["TIME"] = "Tiempo:";
diff --git a/common/js/calendar-ge.js b/common/js/calendar-ge.js
new file mode 100644
index 000000000..392d1c240
--- /dev/null
+++ b/common/js/calendar-ge.js
@@ -0,0 +1,129 @@
+// ** I18N
+
+// DyCalendar KO language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation: bradly1, <bradly1@paran.com>
+// Encoding: UTF-8
+// lang : ge
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+DyCalendar._DN = new Array
+("Sonntag",
+  "Montag",
+  "Dienstag",
+  "Mittwoch",
+  "Donnerstag",
+  "Freitag",
+  "Samstag",
+  "Sonntag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   DyCalendar._SDN_len = N; // short day name length
+//   DyCalendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+DyCalendar._SDN = new Array
+("Sonntag",
+  "Montag",
+  "Dienstag",
+  "Mittwoch",
+  "Donnerstag",
+  "Freitag",
+  "Samstag",
+  "Sonntag");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+DyCalendar._FD = 0;
+
+// full month names
+DyCalendar._MN = new Array
+("Januar",
+  "Februar",
+  "März",
+  "April",
+  "Mai",
+  "Juni",
+  "Juli",
+  "August",
+  "September",
+  "Oktober",
+  "November",
+  "Dezember");
+
+// short month names
+DyCalendar._SMN = new Array
+("Januar",
+  "Februar",
+  "März",
+  "April",
+  "Mai",
+  "Juni",
+  "Juli",
+  "August",
+  "September",
+  "Oktober",
+  "November",
+  "Dezember");
+
+// tooltips
+DyCalendar._TT = {};
+DyCalendar._TT["INFO"] = "Über den Kalender";
+
+DyCalendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+DyCalendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+DyCalendar._TT["PREV_YEAR"] = "Prev. Jahr (halten für Menü)";
+DyCalendar._TT["PREV_MONTH"] = "Prev. Monat (halten für Menü)";
+DyCalendar._TT["GO_TODAY"] = "Gehe Heute";
+DyCalendar._TT["NEXT_MONTH"] = "Nächsten Monat (halten für Menü)";
+DyCalendar._TT["NEXT_YEAR"] = "Nächstes Jahr (halten für Menü)";
+DyCalendar._TT["SEL_DATE"] = "Wählen Sie das Datum";
+DyCalendar._TT["DRAG_TO_MOVE"] = "Per Drag & Drop verschieben";
+DyCalendar._TT["PART_TODAY"] = " (heute)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+DyCalendar._TT["DAY_FIRST"] = "Anzeige% s erste";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+DyCalendar._TT["WEEKEND"] = "0,6";
+
+DyCalendar._TT["CLOSE"] = "Schließen";
+DyCalendar._TT["TODAY"] = "Heute";
+DyCalendar._TT["TIME_PART"] = "(Shift-)Klicken Sie oder ziehen Sie ändern Wert";
+
+// date formats
+DyCalendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+DyCalendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+DyCalendar._TT["WK"] = "wk";
+DyCalendar._TT["TIME"] = "Zeit:";
diff --git a/common/js/calendar-ru.js b/common/js/calendar-ru.js
new file mode 100644
index 000000000..6de06b2a8
--- /dev/null
+++ b/common/js/calendar-ru.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// DyCalendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+DyCalendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   DyCalendar._SDN_len = N; // short day name length
+//   DyCalendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+DyCalendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+DyCalendar._FD = 0;
+
+// full month names
+DyCalendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+DyCalendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+DyCalendar._TT = {};
+DyCalendar._TT["INFO"] = "About the calendar";
+
+DyCalendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+DyCalendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+DyCalendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+DyCalendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+DyCalendar._TT["GO_TODAY"] = "Go Today";
+DyCalendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+DyCalendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+DyCalendar._TT["SEL_DATE"] = "Select date";
+DyCalendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+DyCalendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+DyCalendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+DyCalendar._TT["WEEKEND"] = "0,6";
+
+DyCalendar._TT["CLOSE"] = "Close";
+DyCalendar._TT["TODAY"] = "Today";
+DyCalendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+DyCalendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+DyCalendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+DyCalendar._TT["WK"] = "wk";
+DyCalendar._TT["TIME"] = "Time:";

From 0d93b4704bface36e774e0683ed2ab3f7689daa9 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 12 May 2008 04:09:08 +0000
Subject: [PATCH 090/111] =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=9A=A9=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=96=B8?=
 =?UTF-8?q?=EC=96=B4=ED=8C=A9=20=EC=A0=81=EC=9A=A9?=
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@4188 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/skins/xe_board/extra_var_form.html     | 6 ++++++
 modules/board/skins/xe_guestbook/extra_var_form.html | 6 ++++++
 modules/counter/tpl/index.html                       | 6 ++++++
 modules/editor/components/poll_maker/tpl/popup.html  | 6 ++++++
 modules/member/skins/default/modify_info.html        | 6 ++++++
 modules/member/skins/default/signup_form.html        | 6 ++++++
 modules/member/tpl/insert_member.html                | 6 ++++++
 7 files changed, 42 insertions(+)

diff --git a/modules/board/skins/xe_board/extra_var_form.html b/modules/board/skins/xe_board/extra_var_form.html
index 155320543..5a2f8b2b6 100644
--- a/modules/board/skins/xe_board/extra_var_form.html
+++ b/modules/board/skins/xe_board/extra_var_form.html
@@ -4,6 +4,12 @@
 <!--%import("../../../../common/js/calendar.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
+<!--@elseif($lang_type == 'es')-->
+    <!--%import("../../../../common/js/es.js",optimized=false)-->
+<!--@elseif($lang_type == 'ge')-->
+    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+<!--@elseif($lang_type == 'ru')-->
+    <!--%import("../../../../common/js/ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/board/skins/xe_guestbook/extra_var_form.html b/modules/board/skins/xe_guestbook/extra_var_form.html
index e65333346..db60f6953 100644
--- a/modules/board/skins/xe_guestbook/extra_var_form.html
+++ b/modules/board/skins/xe_guestbook/extra_var_form.html
@@ -4,6 +4,12 @@
 <!--%import("../../../../common/js/calendar.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
+<!--@elseif($lang_type == 'es')-->
+    <!--%import("../../../../common/js/es.js",optimized=false)-->
+<!--@elseif($lang_type == 'ge')-->
+    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+<!--@elseif($lang_type == 'ru')-->
+    <!--%import("../../../../common/js/ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html
index 1141c1843..a14c87ca2 100644
--- a/modules/counter/tpl/index.html
+++ b/modules/counter/tpl/index.html
@@ -4,6 +4,12 @@
 <!--%import("../../common/js/calendar.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../common/js/calendar-ko.js",optimized=false)-->
+<!--@elseif($lang_type == 'es')-->
+    <!--%import("../../common/js/es.js",optimized=false)-->
+<!--@elseif($lang_type == 'ge')-->
+    <!--%import("../../common/js/ge.js",optimized=false)-->
+<!--@elseif($lang_type == 'ru')-->
+    <!--%import("../../common/js/ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index a299c6eb2..b75a2c570 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -7,6 +7,12 @@
 <!--%import("../../../../../common/js/calendar.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../../common/js/calendar-ko.js",optimized=false)-->
+<!--@elseif($lang_type == 'es')-->
+    <!--%import("../../../../../common/js/es.js",optimized=false)-->
+<!--@elseif($lang_type == 'ge')-->
+    <!--%import("../../../../../common/js/ge.js",optimized=false)-->
+<!--@elseif($lang_type == 'ru')-->
+    <!--%import("../../../../../common/js/ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 6d4c2996b..69ff4fdc6 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -20,6 +20,12 @@
 <!--%import("../../../../common/js/calendar.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
+<!--@elseif($lang_type == 'es')-->
+    <!--%import("../../../../common/js/es.js",optimized=false)-->
+<!--@elseif($lang_type == 'ge')-->
+    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+<!--@elseif($lang_type == 'ru')-->
+    <!--%import("../../../../common/js/ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 041dd4018..62d24ead7 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -6,6 +6,12 @@
 <!--%import("../../../../common/js/calendar.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
+<!--@elseif($lang_type == 'es')-->
+    <!--%import("../../../../common/js/es.js",optimized=false)-->
+<!--@elseif($lang_type == 'ge')-->
+    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+<!--@elseif($lang_type == 'ru')-->
+    <!--%import("../../../../common/js/ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index d9b6ee69f..b503977e5 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -6,6 +6,12 @@
 <!--%import("../../common/js/calendar.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../common/js/calendar-ko.js",optimized=false)-->
+<!--@elseif($lang_type == 'es')-->
+    <!--%import("../../common/js/es.js",optimized=false)-->
+<!--@elseif($lang_type == 'ge')-->
+    <!--%import("../../common/js/ge.js",optimized=false)-->
+<!--@elseif($lang_type == 'ru')-->
+    <!--%import("../../common/js/ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->

From 3b46ced55a50c5c5f279f9aa6a18d20f66bba5c8 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 12 May 2008 04:16:43 +0000
Subject: [PATCH 091/111] =?UTF-8?q?r4188=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20(=ED=8C=8C=EC=9D=BC=EB=AA=85=20=EC=98=A4=EB=A5=98)?=
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@4189 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/skins/xe_board/extra_var_form.html     | 6 +++---
 modules/board/skins/xe_guestbook/extra_var_form.html | 6 +++---
 modules/counter/tpl/index.html                       | 6 +++---
 modules/editor/components/poll_maker/tpl/popup.html  | 6 +++---
 modules/member/skins/default/modify_info.html        | 6 +++---
 modules/member/tpl/insert_member.html                | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/board/skins/xe_board/extra_var_form.html b/modules/board/skins/xe_board/extra_var_form.html
index 5a2f8b2b6..240165324 100644
--- a/modules/board/skins/xe_board/extra_var_form.html
+++ b/modules/board/skins/xe_board/extra_var_form.html
@@ -5,11 +5,11 @@
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
-    <!--%import("../../../../common/js/es.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-es.js",optimized=false)-->
 <!--@elseif($lang_type == 'ge')-->
-    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
-    <!--%import("../../../../common/js/ru.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/board/skins/xe_guestbook/extra_var_form.html b/modules/board/skins/xe_guestbook/extra_var_form.html
index db60f6953..52e313fc3 100644
--- a/modules/board/skins/xe_guestbook/extra_var_form.html
+++ b/modules/board/skins/xe_guestbook/extra_var_form.html
@@ -5,11 +5,11 @@
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
-    <!--%import("../../../../common/js/es.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-es.js",optimized=false)-->
 <!--@elseif($lang_type == 'ge')-->
-    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
-    <!--%import("../../../../common/js/ru.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html
index a14c87ca2..11f2bb588 100644
--- a/modules/counter/tpl/index.html
+++ b/modules/counter/tpl/index.html
@@ -5,11 +5,11 @@
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
-    <!--%import("../../common/js/es.js",optimized=false)-->
+    <!--%import("../../common/js/calendar-es.js",optimized=false)-->
 <!--@elseif($lang_type == 'ge')-->
-    <!--%import("../../common/js/ge.js",optimized=false)-->
+    <!--%import("../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
-    <!--%import("../../common/js/ru.js",optimized=false)-->
+    <!--%import("../../common/js/calendar-ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index b75a2c570..be20bc134 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -8,11 +8,11 @@
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
-    <!--%import("../../../../../common/js/es.js",optimized=false)-->
+    <!--%import("../../../../../common/js/calendar-es.js",optimized=false)-->
 <!--@elseif($lang_type == 'ge')-->
-    <!--%import("../../../../../common/js/ge.js",optimized=false)-->
+    <!--%import("../../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
-    <!--%import("../../../../../common/js/ru.js",optimized=false)-->
+    <!--%import("../../../../../common/js/calendar-ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 69ff4fdc6..1808ffbb6 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -21,11 +21,11 @@
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
-    <!--%import("../../../../common/js/es.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-es.js",optimized=false)-->
 <!--@elseif($lang_type == 'ge')-->
-    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
-    <!--%import("../../../../common/js/ru.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index b503977e5..a0fd10738 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -7,11 +7,11 @@
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
-    <!--%import("../../common/js/es.js",optimized=false)-->
+    <!--%import("../../common/js/calendar-es.js",optimized=false)-->
 <!--@elseif($lang_type == 'ge')-->
-    <!--%import("../../common/js/ge.js",optimized=false)-->
+    <!--%import("../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
-    <!--%import("../../common/js/ru.js",optimized=false)-->
+    <!--%import("../../common/js/calendar-ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->

From e8c8416d3827a15201c5e0593010227d13ab7bca Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Mon, 12 May 2008 04:35:39 +0000
Subject: [PATCH 092/111] =?UTF-8?q?r4189=20=EB=B9=A0=EC=A7=84=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EB=8B=A4=EC=8B=9C=20=EC=88=98=EC=A0=95;?=
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@4190 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/skins/default/signup_form.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 62d24ead7..4acb1353a 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -7,11 +7,11 @@
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
-    <!--%import("../../../../common/js/es.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-es.js",optimized=false)-->
 <!--@elseif($lang_type == 'ge')-->
-    <!--%import("../../../../common/js/ge.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
-    <!--%import("../../../../common/js/ru.js",optimized=false)-->
+    <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->

From a93a5bb13aee0f1faa79e6e8fe42f610ec2a7b5e Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 13 May 2008 07:44:54 +0000
Subject: [PATCH 093/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=9C=20=EB=B2=88=EC=97=AD=EA=B3=BC=20?=
 =?UTF-8?q?=EA=B8=B0=EC=A1=B4=EB=B2=88=EC=97=AD=20=EC=88=98=EC=A0=95.?=
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@4191 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/autolink/conf/info.xml               | 5 +++++
 addons/autolink/lang/zh-CN.lang.php         | 9 +++++++++
 addons/resize_image/conf/info.xml           | 5 +++++
 common/lang/zh-CN.lang.php                  | 8 ++++----
 layouts/xe_blog/conf/info.xml               | 8 ++++----
 modules/addon/lang/zh-CN.lang.php           | 2 +-
 modules/board/lang/zh-CN.lang.php           | 4 ++--
 modules/editor/lang/zh-CN.lang.php          | 2 +-
 modules/editor/skins/default_black/skin.xml | 1 +
 modules/importer/lang/zh-CN.lang.php        | 9 +++++----
 modules/install/lang/zh-CN.lang.php         | 4 ++--
 modules/member/lang/zh-CN.lang.php          | 4 ++--
 widgets/point_status/conf/info.xml          | 6 ++++++
 widgets/point_status/skins/default/skin.xml | 5 +++++
 14 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 addons/autolink/lang/zh-CN.lang.php

diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml
index 72cdf8ab3..1673cc894 100644
--- a/addons/autolink/conf/info.xml
+++ b/addons/autolink/conf/info.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <addon version="0.1">
   <title xml:lang="ko">자동 링크 애드온</title>
+  <title xml:lang="zh-CN">自动链接插件</title>
   <title xml:lang="es">auto vínculo addon</title>
   <title xml:lang="ru">авто ссылка аддон</title>
   <title xml:lang="ge">Auto-Link Addon</title>
   <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 22">
     <name xml:lang="ko">zero</name>
+	<name xml:lang="zh-CN">zero</name>
 	<name xml:lang="es">zero</name>
 	<name xml:lang="ru">zero</name>
 	<name xml:lang="ge">zero</name>
     <description xml:lang="ko">
         게시글과 댓글의 내용중 http로 시작되는 일반 문자열에 자동으로 링크를 걸고 각 링크에 마우스 오버시 새창과 현재창 메뉴가 나타나도록 꾸미는 애드온입니다.
+    </description>
+	<description xml:lang="zh-CN">
+        主题及评论中以http开始的字符串，自动转换为链接。并且鼠标移到链接上方时，将出现可选(新窗/本页面)提示框。
     </description>
 	    <description xml:lang="es">
         Los comentarios que comienzan con http naeyongjung tema común de la cadena para vincular automáticamente a colgar el puntero del ratón sobre cada uno de los vínculos y saechang Ciudad y aparecen en el menú de add-on de decoración.
diff --git a/addons/autolink/lang/zh-CN.lang.php b/addons/autolink/lang/zh-CN.lang.php
new file mode 100644
index 000000000..ba405a6ed
--- /dev/null
+++ b/addons/autolink/lang/zh-CN.lang.php
@@ -0,0 +1,9 @@
+<?php
+    /**
+     * @file   addons/autolink/lang/ko.lang.php
+     * @author zero (zero@zeroboard.com)
+     * @brief  中文语言包
+     **/
+    $lang->open_cur_window = "本页面";
+    $lang->open_new_window = "新窗口";
+?>
diff --git a/addons/resize_image/conf/info.xml b/addons/resize_image/conf/info.xml
index 5c471b2f3..570315e22 100644
--- a/addons/resize_image/conf/info.xml
+++ b/addons/resize_image/conf/info.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <addon version="0.1">
   <title xml:lang="ko">본문내 이미지 조절 애드온</title>
+  <title xml:lang="zh-CN">内容区图片缩放插件</title>
   <title xml:lang="es">Imagen de control add-on bonmunnae</title>
   <title xml:lang="ru">Image контроля добавить-на bonmunnae</title>
   <title xml:lang="ge">Image-Add-on bonmunnae</title>
   <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 22">
     <name xml:lang="ko">zero</name>
+    <name xml:lang="zh-CN">zero</name>
 	<name xml:lang="es">zero</name>
 	<name xml:lang="ge">zero</name>
 	<name xml:lang="ru">zero</name>
@@ -14,6 +16,9 @@
 	<name xml:lang="jp">zero</name>
     <description xml:lang="ko">
         본문내에 삽입된 이미지의 크기를 본문크기에 맞게 하고 클릭시 원본을 보여주는 애드온입니다.
+    </description>
+    <description xml:lang="zh-CN">
+        自动调整主题内容区内的图片大小，点击将显示原始大小的插件。
     </description>
 	    <description xml:lang="es">
         La imagen corporal se inserta dentro del cuerpo para que se adapte al tamaño de la muestra original cuando hago clic en los add-ons.
diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
index 52803f03c..a5ab90742 100644
--- a/common/lang/zh-CN.lang.php
+++ b/common/lang/zh-CN.lang.php
@@ -111,8 +111,8 @@
     $lang->notify = '通告';
     $lang->order_target = '排序对象';
     $lang->order_type = '排序方式';
-    $lang->order_asc = '继承皇位';
-    $lang->order_desc = '降临';
+    $lang->order_asc = '升序';
+    $lang->order_desc = '倒序';
 
     $lang->mid = '模块名称';
     $lang->layout = '布局';
@@ -194,7 +194,7 @@
     $lang->success_updated = '修改成功！';
     $lang->success_deleted = '删除成功！';
     $lang->success_voted = '推荐成功！';
-    $lang->success_blamed = 'Blamed success_blamed';
+    $lang->success_blamed = '反对成功！';
     $lang->success_moved = '移动成功！';
     $lang->success_sended = '发送成功！';
     $lang->success_reset = '初始化成功 !';
@@ -205,7 +205,7 @@
     $lang->fail_to_move = '移动成功！';
 	
     $lang->failed_voted = '您不能推荐！';
-    $lang->failed_blamed = 'Could not blame';
+    $lang->failed_blamed = '您不能投反对！';
     $lang->failed_declared = '您不具备举报权限！';
     $lang->fail_to_delete_have_children = '不能删除有回复的评论！';
 
diff --git a/layouts/xe_blog/conf/info.xml b/layouts/xe_blog/conf/info.xml
index 2d2bc8665..fc1f9ecfc 100644
--- a/layouts/xe_blog/conf/info.xml
+++ b/layouts/xe_blog/conf/info.xml
@@ -121,14 +121,14 @@
         <var name="target_mid" type="text">
             <title xml:lang="ko">기본 모듈</title>
             <title xml:lang="jp">기본 모듈</title>
-            <title xml:lang="zh-CN">기본 모듈</title>
+            <title xml:lang="zh-CN">默认模块</title>
             <title xml:lang="en">Basic module</title>
 			<title xml:lang="ge">Basismodul</title>
 			<title xml:lang="es">Módulo Básico</title>
 			<title xml:lang="ru">Основной модуль</title>
             <description xml:lang="ko">기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다</description>
             <description xml:lang="jp">기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다</description>
-            <description xml:lang="zh-CN">기본 모듈을 지정해주시면 레이아웃에서 표시되는 위젯들이 정상적으로 동작을 하게 됩니다</description>
+            <description xml:lang="zh-CN">为了让博客系统中的控件正常运作，在这里必须得指定默认版面模块名。</description>
             <description xml:lang="en">The widgets that are being displayed in the layout will work properly if you select the basic module</description>
 			<description xml:lang="ge">Die Widgets, die angezeigt werden im Layout wird ordnungsgemäß funktionieren, wenn Sie das Basismodul</description>
 			<description xml:lang="es">Los reproductores que se muestran en el diseño funcionará correctamente si selecciona el módulo básico</description>
@@ -152,14 +152,14 @@
         <var name="profile_image" type="image">
             <title xml:lang="ko">프로필 이미지</title>
             <title xml:lang="jp">プロフィールイメージ</title>
-            <title xml:lang="zh-CN">博客个性图片</title>
+            <title xml:lang="zh-CN">博客头像</title>
             <title xml:lang="en">Profile Image</title>
 			<title xml:lang="ge">Profil Bilder</title>
 			<title xml:lang="es">Perfil de Imagen</title>
 			<title xml:lang="ru">Профиль Изображение</title>
             <description xml:lang="ko">프로필 이미지를 입력해 주세요 (가로 사이즈는 160px이 가장 보기 좋습니다)</description>
             <description xml:lang="jp">プロフィールイメージを入力してください（横幅は「160px」が一番適しています）。</description>
-            <description xml:lang="zh-CN">请输入博客个性图片(推荐宽度160px)。</description>
+            <description xml:lang="zh-CN">请上传博客个性头像(推荐宽度为160px)。</description>
             <description xml:lang="en">Please input profile image (It is recommended to set width as 160px)</description>
 			<description xml:lang="ge">itte geben Sie Ihre Image-Profil (Es wird empfohlen, Breite 160px)</description>
 			<description xml:lang="es">Por favor, el perfil de entrada de imagen (Se recomienda configurar el ancho de 160px)</description>
diff --git a/modules/addon/lang/zh-CN.lang.php b/modules/addon/lang/zh-CN.lang.php
index 8d62b4780..acd4f2a73 100644
--- a/modules/addon/lang/zh-CN.lang.php
+++ b/modules/addon/lang/zh-CN.lang.php
@@ -11,6 +11,6 @@
     $lang->addon_maker = '插件作者';
     $lang->addon_history = '更新纪录 ';
 
-    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
+    $lang->about_addon_mid = "可以指定使用插件的对象。<br />(全部解除表示可用在所有对象。)";
     $lang->about_addon = '插件是加载扩展功能的动作，而不是输出结果组件。<br />启用/禁用插件，为网站提供强大的功能。';
 ?>
diff --git a/modules/board/lang/zh-CN.lang.php b/modules/board/lang/zh-CN.lang.php
index 09612c92e..40fb9a936 100644
--- a/modules/board/lang/zh-CN.lang.php
+++ b/modules/board/lang/zh-CN.lang.php
@@ -34,11 +34,11 @@
     // 信息、提示..
     $lang->about_category_title = '请输入分类名。';
     $lang->about_expand = '选择此项将维持展开状态。';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
+    $lang->about_category_group_srls = '被选的用户组才可以查看此分类。';
     $lang->about_layout_setup = '可直接编辑博客布局代码。可以把控件代码插入到您喜欢的位置。';
     $lang->about_board_category = '可以添加/删除分类项<br />分类有异常情况时，可以尝试重新生成缓冲文件。';
     $lang->about_except_notice = "设置公告目录项不再重复显示到普通目录当中。";
     $lang->about_board = "可生成，管理版面的模块。\n生成版面后，点击模块名即可对其详细设置。";
     $lang->about_consultation = "咨询功能是指除有管理权限的会员以外，其他会员只能浏览自己发表的主题。\n使用咨询功能时系统将自动禁止非会员的发表主题权限。";
-    $lang->about_admin_mail = '有新的发表主题或评论时，将自动发电子邮件来通知管理员。<br />多数电子邮件由逗号(,)来分隔。';
+    $lang->about_admin_mail = '有新的主题或评论时，将自动发电子邮件来通知管理员。<br />多数电子邮件由逗号(,)来分隔。';
 ?>
diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php
index ff92aa4f6..66cdfd8ca 100644
--- a/modules/editor/lang/zh-CN.lang.php
+++ b/modules/editor/lang/zh-CN.lang.php
@@ -17,7 +17,7 @@
 
     $lang->about_component = "组件简介";
     $lang->about_component_grant = '可以设置除默认组件外的扩展组件使用权限<br />(全部解除时任何用户都可以使用)。';
-    $lang->about_component_mid = "에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
+    $lang->about_component_mid = "可以指定使用编辑器组件的对象。<br />(全部解除时任何用户都可以使用)。";
 
     $lang->msg_component_is_not_founded = '找不到%s 组件说明！';
     $lang->msg_component_is_inserted = '您选择的组件已插入！';
diff --git a/modules/editor/skins/default_black/skin.xml b/modules/editor/skins/default_black/skin.xml
index 491f94c00..f33750c0e 100644
--- a/modules/editor/skins/default_black/skin.xml
+++ b/modules/editor/skins/default_black/skin.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skin>
   <title xml:lang="ko">제로보드XE 검은 배경 기본 에디터</title>
+  <title xml:lang="zh-CN">zbXE黑色背景编辑器默认皮肤</title>
   <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
     <name xml:lang="ko">zero</name>
     <name xml:lang="zh-CN">Zero</name>
diff --git a/modules/importer/lang/zh-CN.lang.php b/modules/importer/lang/zh-CN.lang.php
index 137b31008..7d4f0852b 100644
--- a/modules/importer/lang/zh-CN.lang.php
+++ b/modules/importer/lang/zh-CN.lang.php
@@ -8,7 +8,7 @@
     // 按钮上使用的语言
     $lang->cmd_sync_member = '同步';
     $lang->cmd_continue = '继续进行';
-    $lang->preprocessing = '데이터 이전을 위한 사전 준비중입니다.';
+    $lang->preprocessing = '正准备数据导入...';
 
     // 项目
     $lang->importer = '数据导入';
@@ -25,16 +25,18 @@
         1 => 'Step 1. 选择导入对象',
         12 => 'Step 1-2. 选择模块对象',
         13 => 'Step 1-3. 选择对象分类',
-        2 => 'Step 2. 上传XML文件',
+        2 => 'Step 2. XML文件',
         3 => 'Step 2. 同步会员信息和文章信息',
+        99 => '数据导入',
     );
 
     $lang->import_step_desc = array(
         1 => '请选择要导入的XML文件种类。',
         12 => '请选择要导入的对象模块。',
         13 => '请选择要导入的对象分类。',
-        2 => "请输入要导入的XML文件的位置。\n位于同一个服务器时，可输入相对或绝对路径，位于不同服务器时，可输入http://地址。",
+        2 => "请输入要导入的XML文件的位置。\n可输入相对或绝对路径。",
         3 => '数据导入后可能会导致会员信息和文章内容信息的误差。这时以user_id进行同步即可解决问题。',
+        99 => '正在数据导入中...',
     );
 
     // 信息/提示
@@ -53,6 +55,5 @@
     $lang->about_type_module = '数据导入对象为版面主题时请选择此项。';
     $lang->about_type_syncmember = '导入会员信息和文章信息后需要同步会员信息时请选择此项。';
     $lang->about_importer = "不仅可以导入Zeroboard 4，Zb5beta的数据,也可以把其他程序数据导入到Zeroboard XE当中。\n导入数据时请利用 <a href=\"http://svn.zeroboard.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a>生成XML文件后再上传。";
-
     $lang->about_target_path = "为了下载附件请输入Zeroboard 4的安装位置。\n位置在同一个服务器时，请输入如 /home/id/public_html/bbs的路径,在不同服务器时，请输入如 http://域名/bbs的url地址。";
 ?>
diff --git a/modules/install/lang/zh-CN.lang.php b/modules/install/lang/zh-CN.lang.php
index a4d4d6300..6905d9b62 100644
--- a/modules/install/lang/zh-CN.lang.php
+++ b/modules/install/lang/zh-CN.lang.php
@@ -254,8 +254,8 @@ EndOfLicense;
     $lang->about_rewrite = '如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。';
     $lang->time_zone = '时区';
     $lang->about_time_zone = '服务器时间和您所处的时间有差异时，可以设置时区来满足你所需要的时间显示。';
-    $lang->qmail_compatibility = 'Qmail 호환';
-    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
+    $lang->qmail_compatibility = 'Qmail互换';
+    $lang->about_qmail_compatibility = '支持不能识别CRLF为换行符的Qmail等MTA，也能发送电子邮件。';
 
     $lang->about_database_file = 'Sqlite是文件里保存数据。数据库的文件位置应该放在web不能访问的地方。<br/><span style="color:red">数据文件应放在具有707属性的位置。</span>';
 
diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index 023d99ef4..23d3a637e 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -67,7 +67,7 @@
     $lang->webmaster_email = '管理员电子邮件';
 
     $lang->about_keep_signed = '关闭浏览器后也将维持登录状态。\n\n使用自动登录功能，可解决每次访问都要输入用户名及密码的麻烦。\n\n为防止个人信息泄露，在网吧，学校等公共场所请务必要确认解除登录状态。';
-	$lang->about_webmaster_name = '请输入认证所需的电子邮件地址或管理其他网站时要使用的网站管理员名称。(默认 : webmaster)';
+    $lang->about_webmaster_name = '请输入认证所需的电子邮件地址或管理其他网站时要使用的网站管理员名称。(默认 : webmaster)';
     $lang->about_webmaster_email = '请输入网站管理员的电子邮件地址。';
 
     $lang->search_target_list = array(
@@ -103,7 +103,7 @@
     $lang->cmd_send_mail = '发送邮件';
     $lang->cmd_manage_id = '禁止用户名管理';
     $lang->cmd_manage_form = '注册表单管理';
-    $lang->cmd_view_own_document = '查看我的帖子';
+    $lang->cmd_view_own_document = '查看发表主题';
     $lang->cmd_view_scrapped_document = '查看收藏';
     $lang->cmd_view_saved_document = '查看临时保存箱';
     $lang->cmd_send_email = '发送邮件';
diff --git a/widgets/point_status/conf/info.xml b/widgets/point_status/conf/info.xml
index 0a79c135e..295ac149b 100644
--- a/widgets/point_status/conf/info.xml
+++ b/widgets/point_status/conf/info.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <widget version="0.1">
     <title xml:lang="ko">포인트 현황 출력 위젯</title>
+    <title xml:lang="zh-CN">在线会员积分现况</title>
     <title xml:lang="en">Point Status</title>
     <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 23">
         <name xml:lang="ko">제로</name>
+        <name xml:lang="zh-CN">zero</name>
 		<name xml:lang="en">Zero</name>
         <description xml:lang="ko">
             로그인한 회원의 포인트 현황을 출력하는 위젯입니다.
             캐시는 0으로 해주셔야 합니다.
+        </description>
+        <description xml:lang="zh-CN">
+            显示在线会员积分现况的控件。
+            缓冲要设置为0。
         </description>
 		<description xml:lang="en">
             This widget displays online members' points status.
diff --git a/widgets/point_status/skins/default/skin.xml b/widgets/point_status/skins/default/skin.xml
index dd001b2e5..1fc8396c3 100644
--- a/widgets/point_status/skins/default/skin.xml
+++ b/widgets/point_status/skins/default/skin.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skin>
   <title xml:lang="ko">회원 포인트 현황 기본 스킨</title>
+  <title xml:lang="zh-CN">在线会员积分现况默认皮肤</title>
   <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 4. 23">
     <name xml:lang="ko">제로</name>
+    <name xml:lang="zh-CN">zero</name>
     <description xml:lang="ko">
         포인트 현황 출력 위젯의 기본 스킨입니다.
     </description>
+    <description xml:lang="zh-CN">
+        显示在线会员积分现况的默认皮肤。
+    </description>
   </maker>
   <colorset>
     <color name="normal">

From dd98e48639eaf0a7c8c7c0bc4e86ce754067b33d Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 13 May 2008 08:08:27 +0000
Subject: [PATCH 094/111] =?UTF-8?q?calendar=EC=9D=98=20=EC=A4=91=EA=B5=AD?=
 =?UTF-8?q?=EC=96=B4=20=EB=B2=88=EC=97=AD=20=EC=A0=81=EC=9A=A9?=
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@4192 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/calendar-zh-CN.js                   | 124 ++++++++++++++++++
 .../board/skins/xe_board/extra_var_form.html  |   2 +
 .../skins/xe_guestbook/extra_var_form.html    |   2 +
 modules/counter/tpl/index.html                |   2 +
 .../components/poll_maker/tpl/popup.html      |   2 +
 modules/member/skins/default/modify_info.html |   2 +
 modules/member/skins/default/signup_form.html |   2 +
 modules/member/tpl/insert_member.html         |   2 +
 8 files changed, 138 insertions(+)
 create mode 100644 common/js/calendar-zh-CN.js

diff --git a/common/js/calendar-zh-CN.js b/common/js/calendar-zh-CN.js
new file mode 100644
index 000000000..c6896043f
--- /dev/null
+++ b/common/js/calendar-zh-CN.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// DyCalendar zh-CN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation: Yourim Yi <yyi@yourim.net>
+// Encoding: UTF-8
+// lang : ko
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+
+DyCalendar._DN = new Array
+("星期日",
+ "星期一",
+ "星期二",
+ "星期三",
+ "星期四",
+ "星期五",
+ "星期六",
+ "星期日");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   DyCalendar._SDN_len = N; // short day name length
+//   DyCalendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+DyCalendar._SDN = new Array
+("日",
+ "一",
+ "二",
+ "三",
+ "四",
+ "五",
+ "六",
+ "日");
+
+// full month names
+DyCalendar._MN = new Array
+("1月",
+ "2月",
+ "3月",
+ "4月",
+ "5月",
+ "6月",
+ "7月",
+ "8月",
+ "9月",
+ "10月",
+ "11月",
+ "12月");
+
+// short month names
+DyCalendar._SMN = new Array
+("1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12");
+
+// tooltips
+DyCalendar._TT = {};
+DyCalendar._TT["INFO"] = "calendar 简介";
+
+DyCalendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"\n"+
+"下载最新版本请访问 http://www.dynarch.com/projects/calendar/ \n" +
+"\n"+
+"遵循GNU LGPL许可协议。 \n"+
+"具体许可内容请参考 http://gnu.org/licenses/lgpl.html " +
+"\n\n" +
+"日期选择:\n" +
+"- 选择年份请使用 \xab, \xbb 按钮\n" +
+"- 选择月份请使用 " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " 按钮\n" +
+"- 按住按钮可快速的选择所需的年份或月份";
+DyCalendar._TT["ABOUT_TIME"] = "\n\n" +
+"时间选择:\n" +
+"- 鼠标点击可增加时间\n" +
+"- 配合Shift键，时间减少 \n" +
+"- 鼠标按住状态下向右为增加向左为减少，这样时间调整会快一些。\n";
+
+DyCalendar._TT["PREV_YEAR"] = "去年 (按住显示目录)";
+DyCalendar._TT["PREV_MONTH"] = "上月 (按住显示目录)";
+DyCalendar._TT["GO_TODAY"] = "设为今日";
+DyCalendar._TT["NEXT_MONTH"] = "下月 (按住显示目录)";
+DyCalendar._TT["NEXT_YEAR"] = "来年 (按住显示目录)";
+DyCalendar._TT["SEL_DATE"] = "请选择日期";
+DyCalendar._TT["DRAG_TO_MOVE"] = "可以用鼠标拖动";
+DyCalendar._TT["PART_TODAY"] = " (今日)";
+
+DyCalendar._TT["DAY_FIRST"] = "%s排到第一列";
+
+DyCalendar._TT["WEEKEND"] = "0,6";
+
+DyCalendar._TT["CLOSE"] = "关闭";
+DyCalendar._TT["TODAY"] = "今日";
+DyCalendar._TT["TIME_PART"] = "(Shift-)点击或拖动";
+
+// date formats
+DyCalendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+DyCalendar._TT["TT_DATE_FORMAT"] = "%b/%e [%a]";
+
+DyCalendar._TT["WK"] = "周";
+DyCalendar._TT["TIME"] = "时:";
diff --git a/modules/board/skins/xe_board/extra_var_form.html b/modules/board/skins/xe_board/extra_var_form.html
index 240165324..301907639 100644
--- a/modules/board/skins/xe_board/extra_var_form.html
+++ b/modules/board/skins/xe_board/extra_var_form.html
@@ -10,6 +10,8 @@
     <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
     <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
+<!--@elseif($lang_type == 'zh-CN')-->
+    <!--%import("../../../../common/js/calendar-zh-CN.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/board/skins/xe_guestbook/extra_var_form.html b/modules/board/skins/xe_guestbook/extra_var_form.html
index 52e313fc3..c796d1d9c 100644
--- a/modules/board/skins/xe_guestbook/extra_var_form.html
+++ b/modules/board/skins/xe_guestbook/extra_var_form.html
@@ -10,6 +10,8 @@
     <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
     <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
+<!--@elseif($lang_type == 'zh-CN')-->
+    <!--%import("../../../../common/js/calendar-zh-CN.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html
index 11f2bb588..04b40b405 100644
--- a/modules/counter/tpl/index.html
+++ b/modules/counter/tpl/index.html
@@ -10,6 +10,8 @@
     <!--%import("../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
     <!--%import("../../common/js/calendar-ru.js",optimized=false)-->
+<!--@elseif($lang_type == 'zh-CN')-->
+    <!--%import("../../common/js/calendar-zh-CN.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index be20bc134..92b952f2f 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -13,6 +13,8 @@
     <!--%import("../../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
     <!--%import("../../../../../common/js/calendar-ru.js",optimized=false)-->
+<!--@elseif($lang_type == 'zh-CN')-->
+    <!--%import("../../../../../common/js/calendar-zh-CN.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 1808ffbb6..31cbcefc7 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -26,6 +26,8 @@
     <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
     <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
+<!--@elseif($lang_type == 'zh-CN')-->
+    <!--%import("../../../../common/js/calendar-zh-CN.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 4acb1353a..80fa48570 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -12,6 +12,8 @@
     <!--%import("../../../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
     <!--%import("../../../../common/js/calendar-ru.js",optimized=false)-->
+<!--@elseif($lang_type == 'zh-CN')-->
+    <!--%import("../../../../common/js/calendar-zh-CN.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index a0fd10738..1cf462a47 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -12,6 +12,8 @@
     <!--%import("../../common/js/calendar-ge.js",optimized=false)-->
 <!--@elseif($lang_type == 'ru')-->
     <!--%import("../../common/js/calendar-ru.js",optimized=false)-->
+<!--@elseif($lang_type == 'zh-CN')-->
+    <!--%import("../../common/js/calendar-zh-CN.js",optimized=false)-->
 <!--@else-->
     <!--%import("../../common/js/calendar-en.js",optimized=false)-->
 <!--@end-->

From 75ff83f052f2c2b1c457e50d766567f897a409de Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 13 May 2008 13:21:56 +0000
Subject: [PATCH 095/111] =?UTF-8?q?-=20calendar.js=20=EC=95=95=EC=B6=95?=
 =?UTF-8?q?=ED=95=B4=EC=A0=9C=20-=20calendar.min.js=20=EC=95=95=EC=B6=95?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EB=B3=84=EB=8F=84=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@4193 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/calendar.js                         | 1790 ++++++++++++++++-
 common/js/calendar.min.js                     |   18 +
 .../board/skins/xe_board/extra_var_form.html  |    2 +-
 .../skins/xe_guestbook/extra_var_form.html    |    2 +-
 modules/counter/tpl/index.html                |    2 +-
 .../components/poll_maker/tpl/popup.html      |    2 +-
 modules/member/skins/default/modify_info.html |    2 +-
 modules/member/skins/default/signup_form.html |    2 +-
 modules/member/tpl/insert_member.html         |    2 +-
 9 files changed, 1814 insertions(+), 8 deletions(-)
 create mode 100644 common/js/calendar.min.js

diff --git a/common/js/calendar.js b/common/js/calendar.js
index 50ae2ae74..b300af317 100644
--- a/common/js/calendar.js
+++ b/common/js/calendar.js
@@ -15,4 +15,1792 @@
 // $Id: calendar.js,v 1.51 2005/03/07 16:44:31 mishoo Exp $
 
 /** The Calendar object constructor. */
-DyCalendar=function(firstDayOfWeek,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.getDateToolTip=null;this.getDateText=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=DyCalendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=DyCalendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.firstDayOfWeek=typeof firstDayOfWeek=="number"?firstDayOfWeek:DyCalendar._FD;this.showsOtherMonths=false;this.dateStr=dateStr;this.ar_days=null;this.showsTime=false;this.time24=true;this.yearStep=2;this.hiliteToday=true;this.multiple=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof DyCalendar._SDN=="undefined"){if(typeof DyCalendar._SDN_len=="undefined")DyCalendar._SDN_len=3;var ar=new Array();for(var i=8;i>0;){ar[--i]=DyCalendar._DN[i].substr(0,DyCalendar._SDN_len)}DyCalendar._SDN=ar;if(typeof DyCalendar._SMN_len=="undefined")DyCalendar._SMN_len=3;ar=new Array();for(var i=12;i>0;){ar[--i]=DyCalendar._MN[i].substr(0,DyCalendar._SMN_len)}DyCalendar._SMN=ar}};DyCalendar._C=null;DyCalendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));DyCalendar.is_ie5=(DyCalendar.is_ie&&/msie 5\.0/i.test(navigator.userAgent));DyCalendar.is_opera=/opera/i.test(navigator.userAgent);DyCalendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);DyCalendar.getAbsolutePos=function(el){var SL=0,ST=0;var is_div=/^div$/i.test(el.tagName);if(is_div&&el.scrollLeft)SL=el.scrollLeft;if(is_div&&el.scrollTop)ST=el.scrollTop;var r={x:el.offsetLeft-SL,y:el.offsetTop-ST};if(el.offsetParent){var tmp=this.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y}return r};DyCalendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement}else if(type=="mouseout"){related=evt.toElement}}while(related){if(related==el){return true}related=related.parentNode}return false};DyCalendar.removeClass=function(el,className){if(!(el&&el.className)){return}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i]}}el.className=ar.join(" ")};DyCalendar.addClass=function(el,className){DyCalendar.removeClass(el,className);el.className+=" "+className};DyCalendar.getElement=function(ev){var f=DyCalendar.is_ie?window.event.srcElement:ev.currentTarget;while(f.nodeType!=1||/^div$/i.test(f.tagName))f=f.parentNode;return f};DyCalendar.getTargetElement=function(ev){var f=DyCalendar.is_ie?window.event.srcElement:ev.target;while(f.nodeType!=1)f=f.parentNode;return f};DyCalendar.stopEvent=function(ev){ev||(ev=window.event);if(DyCalendar.is_ie){ev.cancelBubble=true;ev.returnValue=false}else{ev.preventDefault();ev.stopPropagation()}return false};DyCalendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func)}else if(el.addEventListener){el.addEventListener(evname,func,true)}else{el["on"+evname]=func}};DyCalendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func)}else if(el.removeEventListener){el.removeEventListener(evname,func,true)}else{el["on"+evname]=null}};DyCalendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type)}else{el=document.createElement(type)}if(typeof parent!="undefined"){parent.appendChild(el)}return el};DyCalendar._add_evs=function(el){with(DyCalendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true)}}};DyCalendar.findMonth=function(el){if(typeof el.month!="undefined"){return el}else if(typeof el.parentNode.month!="undefined"){return el.parentNode}return null};DyCalendar.findYear=function(el){if(typeof el.year!="undefined"){return el}else if(typeof el.parentNode.year!="undefined"){return el.parentNode}return null};DyCalendar.showMonthsCombo=function(){var cal=DyCalendar._C;if(!cal){return false}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}if(cal.activeMonth){DyCalendar.removeClass(cal.activeMonth,"active")}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];DyCalendar.addClass(mon,"active");cal.activeMonth=mon;var s=mc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var mcw=mc.offsetWidth;if(typeof mcw=="undefined")mcw=50;s.left=(cd.offsetLeft+cd.offsetWidth-mcw)+"px"}s.top=(cd.offsetTop+cd.offsetHeight)+"px"};DyCalendar.showYearsCombo=function(fwd){var cal=DyCalendar._C;if(!cal){return false}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}if(cal.activeYear){DyCalendar.removeClass(cal.activeYear,"active")}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.innerHTML=Y;yr.year=Y;yr.style.display="block";show=true}else{yr.style.display="none"}yr=yr.nextSibling;Y+=fwd?cal.yearStep:-cal.yearStep}if(show){var s=yc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var ycw=yc.offsetWidth;if(typeof ycw=="undefined")ycw=50;s.left=(cd.offsetLeft+cd.offsetWidth-ycw)+"px"}s.top=(cd.offsetTop+cd.offsetHeight)+"px"}};DyCalendar.tableMouseUp=function(ev){var cal=DyCalendar._C;if(!cal){return false}if(cal.timeout){clearTimeout(cal.timeout)}var el=cal.activeDiv;if(!el){return false}var target=DyCalendar.getTargetElement(ev);ev||(ev=window.event);DyCalendar.removeClass(el,"active");if(target==el||target.parentNode==el){DyCalendar.cellClick(el,ev)}var mon=DyCalendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}else{var year=DyCalendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}}with(DyCalendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev)}};DyCalendar.tableMouseOver=function(ev){var cal=DyCalendar._C;if(!cal){return}var el=cal.activeDiv;var target=DyCalendar.getTargetElement(ev);if(target==el||target.parentNode==el){DyCalendar.addClass(el,"hilite active");DyCalendar.addClass(el.parentNode,"rowhilite")}else{if(typeof el.navtype=="undefined"||(el.navtype!=50&&(el.navtype==0||Math.abs(el.navtype)>2)))DyCalendar.removeClass(el,"active");DyCalendar.removeClass(el,"hilite");DyCalendar.removeClass(el.parentNode,"rowhilite")}ev||(ev=window.event);if(el.navtype==50&&target!=el){var pos=DyCalendar.getAbsolutePos(el);var w=el.offsetWidth;var x=ev.clientX;var dx;var decrease=true;if(x>pos.x+w){dx=x-pos.x-w;decrease=false}else dx=pos.x-x;if(dx<0)dx=0;var range=el._range;var current=el._current;var count=Math.floor(dx/10)%range.length;for(var i=range.length;--i>=0;)if(range[i]==current)break;while(count-->0)if(decrease){if(--i<0)i=range.length-1}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime()}var mon=DyCalendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}DyCalendar.addClass(mon,"hilite");cal.hilitedMonth=mon}else if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}}else{if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}var year=DyCalendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}DyCalendar.addClass(year,"hilite");cal.hilitedYear=year}else if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}}else if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}}return DyCalendar.stopEvent(ev)};DyCalendar.tableMouseDown=function(ev){if(DyCalendar.getTargetElement(ev)==DyCalendar.getElement(ev)){return DyCalendar.stopEvent(ev)}};DyCalendar.calDragIt=function(ev){var cal=DyCalendar._C;if(!(cal&&cal.dragging)){return false}var posX;var posY;if(DyCalendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft}else{posX=ev.pageX;posY=ev.pageY}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return DyCalendar.stopEvent(ev)};DyCalendar.calDragEnd=function(ev){var cal=DyCalendar._C;if(!cal){return false}cal.dragging=false;with(DyCalendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev)}cal.hideShowCovered()};DyCalendar.dayMouseDown=function(ev){var el=DyCalendar.getElement(ev);if(el.disabled){return false}var cal=el.calendar;cal.activeDiv=el;DyCalendar._C=cal;if(el.navtype!=300)with(DyCalendar){if(el.navtype==50){el._current=el.innerHTML;addEvent(document,"mousemove",tableMouseOver)}else addEvent(document,DyCalendar.is_ie5?"mousemove":"mouseover",tableMouseOver);addClass(el,"hilite active");addEvent(document,"mouseup",tableMouseUp)}else if(cal.isPopup){cal._dragStart(ev)}if(el.navtype==-1||el.navtype==1){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout("DyCalendar.showMonthsCombo()",250)}else if(el.navtype==-2||el.navtype==2){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout((el.navtype>0)?"DyCalendar.showYearsCombo(true)":"DyCalendar.showYearsCombo(false)",250)}else{cal.timeout=null}return DyCalendar.stopEvent(ev)};DyCalendar.dayMouseDblClick=function(ev){DyCalendar.cellClick(DyCalendar.getElement(ev),ev||window.event);if(DyCalendar.is_ie){document.selection.empty()}};DyCalendar.dayMouseOver=function(ev){var el=DyCalendar.getElement(ev);if(DyCalendar.isRelated(el,ev)||DyCalendar._C||el.disabled){return false}if(el.ttip){if(el.ttip.substr(0,1)=="_"){el.ttip=el.caldate.print(el.calendar.ttDateFormat)+el.ttip.substr(1)}el.calendar.tooltips.innerHTML=el.ttip}if(el.navtype!=300){DyCalendar.addClass(el,"hilite");if(el.caldate){DyCalendar.addClass(el.parentNode,"rowhilite")}}return DyCalendar.stopEvent(ev)};DyCalendar.dayMouseOut=function(ev){with(DyCalendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled)return false;removeClass(el,"hilite");if(el.caldate)removeClass(el.parentNode,"rowhilite");if(el.calendar)el.calendar.tooltips.innerHTML=_TT["SEL_DATE"];return stopEvent(ev)}};DyCalendar.cellClick=function(el,ev){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){if(cal.currentDateEl){DyCalendar.removeClass(cal.currentDateEl,"selected");DyCalendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el}}cal.date.setDateOnly(el.caldate);date=cal.date;var other_month=!(cal.dateClicked=!el.otherMonth);if(!other_month&&!cal.currentDateEl)cal._toggleMultipleDate(new Date(date));else newdate=!el.disabled;if(other_month)cal._init(cal.firstDayOfWeek,date)}else{if(el.navtype==200){DyCalendar.removeClass(el,"hilite");cal.callCloseHandler();return}date=new Date(cal.date);if(el.navtype==0)date.setDateOnly(new Date());cal.dateClicked=false;var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max)}date.setMonth(m)};switch(el.navtype){case 400:DyCalendar.removeClass(el,"hilite");var text=DyCalendar._TT["ABOUT"];if(typeof text!="undefined"){text+=cal.showsTime?DyCalendar._TT["ABOUT_TIME"]:""}else{text="Help and about box text is not translated into this language.\n"+"If you know this language and you feel generous please update\n"+"the corresponding file in \"lang\" subdir to match calendar-en.js\n"+"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n"+"Thank you!\n"+"http://dynarch.com/mishoo/calendar.epl\n"}alert(text);return;case-2:if(year>cal.minYear){date.setFullYear(year-1)}break;case-1:if(mon>0){setMonth(mon-1)}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11)}break;case 1:if(mon<11){setMonth(mon+1)}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0)}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1)}break;case 100:cal.setFirstDayOfWeek(el.fdow);return;case 50:var range=el._range;var current=el.innerHTML;for(var i=range.length;--i>=0;)if(range[i]==current)break;if(ev&&ev.shiftKey){if(--i<0)i=range.length-1}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime();return;case 0:if((typeof cal.getDateStatus=="function")&&cal.getDateStatus(date,date.getFullYear(),date.getMonth(),date.getDate())){return false}break}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true}else if(el.navtype==0)newdate=closing=true}if(newdate){ev&&cal.callHandler()}if(closing){DyCalendar.removeClass(el,"hilite");ev&&cal.callCloseHandler()}};DyCalendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true}else{parent=_par;this.isPopup=false}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=DyCalendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;DyCalendar.addEvent(table,"mousedown",DyCalendar.tableMouseDown);var div=DyCalendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none"}div.appendChild(table);var thead=DyCalendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=DyCalendar.createElement("td",row);cell.colSpan=cs;cell.className="button";if(navtype!=0&&Math.abs(navtype)<=2)cell.className+=" nav";DyCalendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;cell.innerHTML="<div unselectable='on'>"+text+"</div>";return cell};row=DyCalendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("?",1,400).ttip=DyCalendar._TT["INFO"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=DyCalendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=DyCalendar._TT["CLOSE"]}row=DyCalendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=DyCalendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=DyCalendar._TT["PREV_MONTH"];this._nav_now=hh(DyCalendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=DyCalendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=DyCalendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=DyCalendar._TT["NEXT_YEAR"];row=DyCalendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=DyCalendar.createElement("td",row);cell.className="name wn";cell.innerHTML=DyCalendar._TT["WK"]}for(var i=7;i>0;--i){cell=DyCalendar.createElement("td",row);if(!i){cell.navtype=100;cell.calendar=this;DyCalendar._add_evs(cell)}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=DyCalendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=DyCalendar.createElement("tr",tbody);if(this.weekNumbers){cell=DyCalendar.createElement("td",row)}for(var j=7;j>0;--j){cell=DyCalendar.createElement("td",row);cell.calendar=this;DyCalendar._add_evs(cell)}}if(this.showsTime){row=DyCalendar.createElement("tr",tbody);row.className="time";cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=2;cell.innerHTML=DyCalendar._TT["TIME"]||"&nbsp;";cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=this.weekNumbers?4:3;(function(){function makeTimePart(className,init,range_start,range_end){var part=DyCalendar.createElement("span",cell);part.className=className;part.innerHTML=init;part.calendar=cal;part.ttip=DyCalendar._TT["TIME_PART"];part.navtype=50;part._range=[];if(typeof range_start!="number")part._range=range_start;else{for(var i=range_start;i<=range_end;++i){var txt;if(i<10&&range_end>=10)txt='0'+i;else txt=''+i;part._range[part._range.length]=txt}}DyCalendar._add_evs(part);return part};var hrs=cal.date.getHours();var mins=cal.date.getMinutes();var t12=!cal.time24;var pm=(hrs>12);if(t12&&pm)hrs-=12;var H=makeTimePart("hour",hrs,t12?1:0,t12?12:23);var span=DyCalendar.createElement("span",cell);span.innerHTML=":";span.className="colon";var M=makeTimePart("minute",mins,0,59);var AP=null;cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=2;if(t12)AP=makeTimePart("ampm",pm?"pm":"am",["am","pm"]);else cell.innerHTML="&nbsp;";cal.onSetTime=function(){var pm,hrs=this.date.getHours(),mins=this.date.getMinutes();if(t12){pm=(hrs>=12);if(pm)hrs-=12;if(hrs==0)hrs=12;AP.innerHTML=pm?"pm":"am"}H.innerHTML=(hrs<10)?("0"+hrs):hrs;M.innerHTML=(mins<10)?("0"+mins):mins};cal.onUpdateTime=function(){var date=this.date;var h=parseInt(H.innerHTML,10);if(t12){if(/pm/i.test(AP.innerHTML)&&h<12)h+=12;else if(/am/i.test(AP.innerHTML)&&h==12)h=0}var d=date.getDate();var m=date.getMonth();var y=date.getFullYear();date.setHours(h);date.setMinutes(parseInt(M.innerHTML,10));date.setFullYear(y);date.setMonth(m);date.setDate(d);this.dateClicked=false;this.callHandler()}})()}else{this.onSetTime=this.onUpdateTime=function(){}}var tfoot=DyCalendar.createElement("tfoot",table);row=DyCalendar.createElement("tr",tfoot);row.className="footrow";cell=hh(DyCalendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=DyCalendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move"}this.tooltips=cell;div=DyCalendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<DyCalendar._MN.length;++i){var mn=DyCalendar.createElement("div");mn.className=DyCalendar.is_ie?"label-IEfix":"label";mn.month=i;mn.innerHTML=DyCalendar._SMN[i];div.appendChild(mn)}div=DyCalendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=DyCalendar.createElement("div");yr.className=DyCalendar.is_ie?"label-IEfix":"label";div.appendChild(yr)}this._init(this.firstDayOfWeek,this.date);parent.appendChild(this.element)};DyCalendar._keyEvent=function(ev){var cal=window._dynarch_popupDyCalendar;if(!cal||cal.multiple)return false;(DyCalendar.is_ie)&&(ev=window.event);var act=(DyCalendar.is_ie||ev.type=="keypress"),K=ev.keyCode;if(ev.ctrlKey){switch(K){case 37:act&&DyCalendar.cellClick(cal._nav_pm);break;case 38:act&&DyCalendar.cellClick(cal._nav_py);break;case 39:act&&DyCalendar.cellClick(cal._nav_nm);break;case 40:act&&DyCalendar.cellClick(cal._nav_ny);break;default:return false}}else switch(K){case 32:DyCalendar.cellClick(cal._nav_now);break;case 27:act&&cal.callCloseHandler();break;case 37:case 38:case 39:case 40:if(act){var prev,x,y,ne,el,step;prev=K==37||K==38;step=(K==37||K==39)?1:7;function setVars(){el=cal.currentDateEl;var p=el.pos;x=p&15;y=p>>4;ne=cal.ar_days[y][x]};setVars();function prevMonth(){var date=new Date(cal.date);date.setDate(date.getDate()-step);cal.setDate(date)};function nextMonth(){var date=new Date(cal.date);date.setDate(date.getDate()+step);cal.setDate(date)};while(1){switch(K){case 37:if(--x>=0)ne=cal.ar_days[y][x];else{x=6;K=38;continue}break;case 38:if(--y>=0)ne=cal.ar_days[y][x];else{prevMonth();setVars()}break;case 39:if(++x<7)ne=cal.ar_days[y][x];else{x=0;K=40;continue}break;case 40:if(++y<cal.ar_days.length)ne=cal.ar_days[y][x];else{nextMonth();setVars()}break}break}if(ne){if(!ne.disabled)DyCalendar.cellClick(ne);else if(prev)prevMonth();else nextMonth()}}break;case 13:if(act)DyCalendar.cellClick(cal.currentDateEl,ev);break;default:return false}return DyCalendar.stopEvent(ev)};DyCalendar.prototype._init=function(firstDayOfWeek,date){var today=new Date(),TY=today.getFullYear(),TM=today.getMonth(),TD=today.getDate();this.table.style.visibility="hidden";var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year)}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year)}this.firstDayOfWeek=firstDayOfWeek;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var day1=(date.getDay()-this.firstDayOfWeek)%7;if(day1<0)day1+=7;date.setDate(-day1);date.setDate(date.getDate()+1);var row=this.tbody.firstChild;var MN=DyCalendar._SMN[month];var ar_days=this.ar_days=new Array();var weekend=DyCalendar._TT["WEEKEND"];var dates=this.multiple?(this.datesCells={}):null;for(var i=0;i<6;++i,row=row.nextSibling){var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.innerHTML=date.getWeekNumber();cell=cell.nextSibling}row.className="daysrow";var hasdays=false,iday,dpos=ar_days[i]=[];for(var j=0;j<7;++j,cell=cell.nextSibling,date.setDate(iday+1)){iday=date.getDate();var wday=date.getDay();cell.className="day";cell.pos=i<<4|j;dpos[j]=cell;var current_month=(date.getMonth()==month);if(!current_month){if(this.showsOtherMonths){cell.className+=" othermonth";cell.otherMonth=true}else{cell.className="emptycell";cell.innerHTML="&nbsp;";cell.disabled=true;continue}}else{cell.otherMonth=false;hasdays=true}cell.disabled=false;cell.innerHTML=this.getDateText?this.getDateText(date,iday):iday;if(dates)dates[date.print("%Y%m%d")]=cell;if(this.getDateStatus){var status=this.getDateStatus(date,year,month,iday);if(this.getDateToolTip){var toolTip=this.getDateToolTip(date,year,month,iday);if(toolTip)cell.title=toolTip}if(status===true){cell.className+=" disabled";cell.disabled=true}else{if(/disabled/i.test(status))cell.disabled=true;cell.className+=" "+status}}if(!cell.disabled){cell.caldate=new Date(date);cell.ttip="_";if(!this.multiple&&current_month&&iday==mday&&this.hiliteToday){cell.className+=" selected";this.currentDateEl=cell}if(date.getFullYear()==TY&&date.getMonth()==TM&&iday==TD){cell.className+=" today";cell.ttip+=DyCalendar._TT["PART_TODAY"]}if(weekend.indexOf(wday.toString())!=-1)cell.className+=cell.otherMonth?" oweekend":" weekend"}}if(!(hasdays||this.showsOtherMonths))row.className="emptyrow"}this.title.innerHTML=DyCalendar._MN[month]+", "+year;this.onSetTime();this.table.style.visibility="visible";this._initMultipleDates()};DyCalendar.prototype._initMultipleDates=function(){if(this.multiple){for(var i in this.multiple){var cell=this.datesCells[i];var d=this.multiple[i];if(!d)continue;if(cell)cell.className+=" selected"}}};DyCalendar.prototype._toggleMultipleDate=function(date){if(this.multiple){var ds=date.print("%Y%m%d");var cell=this.datesCells[ds];if(cell){var d=this.multiple[ds];if(!d){DyCalendar.addClass(cell,"selected");this.multiple[ds]=date}else{DyCalendar.removeClass(cell,"selected");delete this.multiple[ds]}}}};DyCalendar.prototype.setDateToolTipHandler=function(unaryFunction){this.getDateToolTip=unaryFunction};DyCalendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.firstDayOfWeek,date)}};DyCalendar.prototype.refresh=function(){this._init(this.firstDayOfWeek,this.date)};DyCalendar.prototype.setFirstDayOfWeek=function(firstDayOfWeek){this._init(firstDayOfWeek,this.date);this._displayWeekdays()};DyCalendar.prototype.setDateStatusHandler=DyCalendar.prototype.setDisabledHandler=function(unaryFunction){this.getDateStatus=unaryFunction};DyCalendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z};DyCalendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat))}};DyCalendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this)}this.hideShowCovered()};DyCalendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);DyCalendar._C=null;window._dynarch_popupDyCalendar=null};DyCalendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el)};DyCalendar._checkDyCalendar=function(ev){var calendar=window._dynarch_popupDyCalendar;if(!calendar){return false}var el=DyCalendar.is_ie?DyCalendar.getElement(ev):DyCalendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window._dynarch_popupDyCalendar.callCloseHandler();return DyCalendar.stopEvent(ev)}};DyCalendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];DyCalendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];DyCalendar.removeClass(cell,"hilite");DyCalendar.removeClass(cell,"active")}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window._dynarch_popupDyCalendar=this;DyCalendar.addEvent(document,"keydown",DyCalendar._keyEvent);DyCalendar.addEvent(document,"keypress",DyCalendar._keyEvent);DyCalendar.addEvent(document,"mousedown",DyCalendar._checkDyCalendar)}this.hideShowCovered()};DyCalendar.prototype.hide=function(){if(this.isPopup){DyCalendar.removeEvent(document,"keydown",DyCalendar._keyEvent);DyCalendar.removeEvent(document,"keypress",DyCalendar._keyEvent);DyCalendar.removeEvent(document,"mousedown",DyCalendar._checkDyCalendar)}this.element.style.display="none";this.hidden=true;this.hideShowCovered()};DyCalendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show()};DyCalendar.prototype.showAtElement=function(el,opts){var self=this;var p=DyCalendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true}function fixPosition(box){if(box.x<0)box.x=0;if(box.y<0)box.y=0;var cp=document.createElement("div");var s=cp.style;s.position="absolute";s.right=s.bottom=s.width=s.height="0px";document.body.appendChild(cp);var br=DyCalendar.getAbsolutePos(cp);document.body.removeChild(cp);if(DyCalendar.is_ie){br.y+=document.body.scrollTop;br.x+=document.body.scrollLeft}else{br.y+=window.scrollY;br.x+=window.scrollX}var tmp=box.x+box.width-br.x;if(tmp>0)box.x-=tmp;tmp=box.y+box.height-br.y;if(tmp>0)box.y-=tmp};this.element.style.display="block";DyCalendar.continuation_for_the_fucking_khtml_browser=function(){var w=self.element.offsetWidth;var h=self.element.offsetHeight;self.element.style.display="none";var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1)}switch(valign){case"T":p.y-=h;break;case"B":p.y+=el.offsetHeight;break;case"C":p.y+=(el.offsetHeight-h)/2;break;case"t":p.y+=el.offsetHeight-h;break;case"b":break}switch(halign){case"L":p.x-=w;break;case"R":p.x+=el.offsetWidth;break;case"C":p.x+=(el.offsetWidth-w)/2;break;case"l":p.x+=el.offsetWidth-w;break;case"r":break}p.width=w;p.height=h+40;self.monthsCombo.style.display="none";fixPosition(p);self.showAt(p.x,p.y)};if(DyCalendar.is_khtml)setTimeout("DyCalendar.continuation_for_the_fucking_khtml_browser()",10);else DyCalendar.continuation_for_the_fucking_khtml_browser()};DyCalendar.prototype.setDateFormat=function(str){this.dateFormat=str};DyCalendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str};DyCalendar.prototype.parseDate=function(str,fmt){if(!fmt)fmt=this.dateFormat;this.setDate(Date.parseDate(str,fmt))};DyCalendar.prototype.hideShowCovered=function(){if(!DyCalendar.is_ie&&!DyCalendar.is_opera)return;function getVisib(obj){var value=obj.style.visibility;if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){if(!DyCalendar.is_khtml)value=document.defaultView.getComputedStyle(obj,"").getPropertyValue("visibility");else value=''}else if(obj.currentStyle){value=obj.currentStyle.visibility}else value=''}return value};var tags=new Array("applet","iframe","select");var el=this.element;var p=DyCalendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=DyCalendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(this.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc)}cc.style.visibility=cc.__msh_save_visibility}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc)}cc.style.visibility="hidden"}}}};DyCalendar.prototype._displayWeekdays=function(){var fdow=this.firstDayOfWeek;var cell=this.firstdayname;var weekend=DyCalendar._TT["WEEKEND"];for(var i=0;i<7;++i){cell.className="day name";var realday=(i+fdow)%7;if(i){cell.ttip=DyCalendar._TT["DAY_FIRST"].replace("%s",DyCalendar._DN[realday]);cell.navtype=100;cell.calendar=this;cell.fdow=realday;DyCalendar._add_evs(cell)}if(weekend.indexOf(realday.toString())!=-1){DyCalendar.addClass(cell,"weekend")}cell.innerHTML=DyCalendar._SDN[(i+fdow)%7];cell=cell.nextSibling}};DyCalendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none"};DyCalendar.prototype._dragStart=function(ev){if(this.dragging){return}this.dragging=true;var posX;var posY;if(DyCalendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(DyCalendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseup",calDragEnd)}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.parseDate=function(str,fmt){var today=new Date();var y=0;var m=-1;var d=0;var a=str.split(/\W+/);var b=fmt.match(/%./g);var i=0,j=0;var hr=0;var min=0;for(i=0;i<a.length;++i){if(!a[i])continue;switch(b[i]){case"%d":case"%e":d=parseInt(a[i],10);break;case"%m":m=parseInt(a[i],10)-1;break;case"%Y":case"%y":y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);break;case"%b":case"%B":for(j=0;j<12;++j){if(DyCalendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break}}break;case"%H":case"%I":case"%k":case"%l":hr=parseInt(a[i],10);break;case"%P":case"%p":if(/pm/i.test(a[i])&&hr<12)hr+=12;else if(/am/i.test(a[i])&&hr>=12)hr-=12;break;case"%M":min=parseInt(a[i],10);break}}if(isNaN(y))y=today.getFullYear();if(isNaN(m))m=today.getMonth();if(isNaN(d))d=today.getDate();if(isNaN(hr))hr=today.getHours();if(isNaN(min))min=today.getMinutes();if(y!=0&&m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(DyCalendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break}}if(t!=-1){if(m!=-1){d=m+1}m=t}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000)}else if(d==0){d=a[i]}}if(y==0)y=today.getFullYear();if(m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);return today};Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth()}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29}else{return Date._MD[month]}};Date.prototype.getDayOfYear=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,0,0,0,0);var time=now-then;return Math.floor(time/Date.DAY)};Date.prototype.getWeekNumber=function(){var d=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var DoW=d.getDay();d.setDate(d.getDate()-(DoW+6)%7+3);var ms=d.valueOf();d.setMonth(0);d.setDate(4);return Math.round((ms-d.valueOf())/(7*864e5))+1};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate())&&(this.getHours()==date.getHours())&&(this.getMinutes()==date.getMinutes()))};Date.prototype.setDateOnly=function(date){var tmp=new Date(date);this.setDate(1);this.setFullYear(tmp.getFullYear());this.setMonth(tmp.getMonth());this.setDate(tmp.getDate())};Date.prototype.print=function(str){var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s={};var hr=this.getHours();var pm=(hr>=12);var ir=(pm)?(hr-12):hr;var dy=this.getDayOfYear();if(ir==0)ir=12;var min=this.getMinutes();var sec=this.getSeconds();s["%a"]=DyCalendar._SDN[w];s["%A"]=DyCalendar._DN[w];s["%b"]=DyCalendar._SMN[m];s["%B"]=DyCalendar._MN[m];s["%C"]=1+Math.floor(y/100);s["%d"]=(d<10)?("0"+d):d;s["%e"]=d;s["%H"]=(hr<10)?("0"+hr):hr;s["%I"]=(ir<10)?("0"+ir):ir;s["%j"]=(dy<100)?((dy<10)?("00"+dy):("0"+dy)):dy;s["%k"]=hr;s["%l"]=ir;s["%m"]=(m<9)?("0"+(1+m)):(1+m);s["%M"]=(min<10)?("0"+min):min;s["%n"]="\n";s["%p"]=pm?"PM":"AM";s["%P"]=pm?"pm":"am";s["%s"]=Math.floor(this.getTime()/1000);s["%S"]=(sec<10)?("0"+sec):sec;s["%t"]="\t";s["%U"]=s["%W"]=s["%V"]=(wn<10)?("0"+wn):wn;s["%u"]=w+1;s["%w"]=w;s["%y"]=(''+y).substr(2,2);s["%Y"]=y;s["%%"]="%";var re=/%./g;if(!DyCalendar.is_ie5&&!DyCalendar.is_khtml)return str.replace(re,function(par){return s[par]||par});var a=str.match(re);for(var i=0;i<a.length;i++){var tmp=s[a[i]];if(tmp){re=new RegExp(a[i],'g');str=str.replace(re,tmp)}}return str};Date.prototype.__msh_oldSetFullYear=Date.prototype.setFullYear;Date.prototype.setFullYear=function(y){var d=new Date(this);d.__msh_oldSetFullYear(y);if(d.getMonth()!=this.getMonth())this.setDate(28);this.__msh_oldSetFullYear(y)};window._dynarch_popupDyCalendar=null;
\ No newline at end of file
+DyCalendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
+	// member variables
+	this.activeDiv = null;
+	this.currentDateEl = null;
+	this.getDateStatus = null;
+	this.getDateToolTip = null;
+	this.getDateText = null;
+	this.timeout = null;
+	this.onSelected = onSelected || null;
+	this.onClose = onClose || null;
+	this.dragging = false;
+	this.hidden = false;
+	this.minYear = 1970;
+	this.maxYear = 2050;
+	this.dateFormat = DyCalendar._TT["DEF_DATE_FORMAT"];
+	this.ttDateFormat = DyCalendar._TT["TT_DATE_FORMAT"];
+	this.isPopup = true;
+	this.weekNumbers = true;
+	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : DyCalendar._FD; // 0 for Sunday, 1 for Monday, etc.
+	this.showsOtherMonths = false;
+	this.dateStr = dateStr;
+	this.ar_days = null;
+	this.showsTime = false;
+	this.time24 = true;
+	this.yearStep = 2;
+	this.hiliteToday = true;
+	this.multiple = null;
+	// HTML elements
+	this.table = null;
+	this.element = null;
+	this.tbody = null;
+	this.firstdayname = null;
+	// Combo boxes
+	this.monthsCombo = null;
+	this.yearsCombo = null;
+	this.hilitedMonth = null;
+	this.activeMonth = null;
+	this.hilitedYear = null;
+	this.activeYear = null;
+	// Information
+	this.dateClicked = false;
+
+	// one-time initializations
+	if (typeof DyCalendar._SDN == "undefined") {
+		// table of short day names
+		if (typeof DyCalendar._SDN_len == "undefined")
+			DyCalendar._SDN_len = 3;
+		var ar = new Array();
+		for (var i = 8; i > 0;) {
+			ar[--i] = DyCalendar._DN[i].substr(0, DyCalendar._SDN_len);
+		}
+		DyCalendar._SDN = ar;
+		// table of short month names
+		if (typeof DyCalendar._SMN_len == "undefined")
+			DyCalendar._SMN_len = 3;
+		ar = new Array();
+		for (var i = 12; i > 0;) {
+			ar[--i] = DyCalendar._MN[i].substr(0, DyCalendar._SMN_len);
+		}
+		DyCalendar._SMN = ar;
+	}
+};
+
+// ** constants
+
+/// "static", needed for event handlers.
+DyCalendar._C = null;
+
+/// detect a special case of "web browser"
+DyCalendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
+		   !/opera/i.test(navigator.userAgent) );
+
+DyCalendar.is_ie5 = ( DyCalendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
+
+/// detect Opera browser
+DyCalendar.is_opera = /opera/i.test(navigator.userAgent);
+
+/// detect KHTML-based browsers
+DyCalendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
+
+// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
+//        library, at some point.
+
+DyCalendar.getAbsolutePos = function(el) {
+	var SL = 0, ST = 0;
+	var is_div = /^div$/i.test(el.tagName);
+	if (is_div && el.scrollLeft)
+		SL = el.scrollLeft;
+	if (is_div && el.scrollTop)
+		ST = el.scrollTop;
+	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
+	if (el.offsetParent) {
+		var tmp = this.getAbsolutePos(el.offsetParent);
+		r.x += tmp.x;
+		r.y += tmp.y;
+	}
+	return r;
+};
+
+DyCalendar.isRelated = function (el, evt) {
+	var related = evt.relatedTarget;
+	if (!related) {
+		var type = evt.type;
+		if (type == "mouseover") {
+			related = evt.fromElement;
+		} else if (type == "mouseout") {
+			related = evt.toElement;
+		}
+	}
+	while (related) {
+		if (related == el) {
+			return true;
+		}
+		related = related.parentNode;
+	}
+	return false;
+};
+
+DyCalendar.removeClass = function(el, className) {
+	if (!(el && el.className)) {
+		return;
+	}
+	var cls = el.className.split(" ");
+	var ar = new Array();
+	for (var i = cls.length; i > 0;) {
+		if (cls[--i] != className) {
+			ar[ar.length] = cls[i];
+		}
+	}
+	el.className = ar.join(" ");
+};
+
+DyCalendar.addClass = function(el, className) {
+	DyCalendar.removeClass(el, className);
+	el.className += " " + className;
+};
+
+// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
+DyCalendar.getElement = function(ev) {
+	var f = DyCalendar.is_ie ? window.event.srcElement : ev.currentTarget;
+	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
+		f = f.parentNode;
+	return f;
+};
+
+DyCalendar.getTargetElement = function(ev) {
+	var f = DyCalendar.is_ie ? window.event.srcElement : ev.target;
+	while (f.nodeType != 1)
+		f = f.parentNode;
+	return f;
+};
+
+DyCalendar.stopEvent = function(ev) {
+	ev || (ev = window.event);
+	if (DyCalendar.is_ie) {
+		ev.cancelBubble = true;
+		ev.returnValue = false;
+	} else {
+		ev.preventDefault();
+		ev.stopPropagation();
+	}
+	return false;
+};
+
+DyCalendar.addEvent = function(el, evname, func) {
+	if (el.attachEvent) { // IE
+		el.attachEvent("on" + evname, func);
+	} else if (el.addEventListener) { // Gecko / W3C
+		el.addEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = func;
+	}
+};
+
+DyCalendar.removeEvent = function(el, evname, func) {
+	if (el.detachEvent) { // IE
+		el.detachEvent("on" + evname, func);
+	} else if (el.removeEventListener) { // Gecko / W3C
+		el.removeEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = null;
+	}
+};
+
+DyCalendar.createElement = function(type, parent) {
+	var el = null;
+	if (document.createElementNS) {
+		// use the XHTML namespace; IE won't normally get here unless
+		// _they_ "fix" the DOM2 implementation.
+		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
+	} else {
+		el = document.createElement(type);
+	}
+	if (typeof parent != "undefined") {
+		parent.appendChild(el);
+	}
+	return el;
+};
+
+// END: UTILITY FUNCTIONS
+
+// BEGIN: CALENDAR STATIC FUNCTIONS
+
+/** Internal -- adds a set of events to make some element behave like a button. */
+DyCalendar._add_evs = function(el) {
+	with (DyCalendar) {
+		addEvent(el, "mouseover", dayMouseOver);
+		addEvent(el, "mousedown", dayMouseDown);
+		addEvent(el, "mouseout", dayMouseOut);
+		if (is_ie) {
+			addEvent(el, "dblclick", dayMouseDblClick);
+			el.setAttribute("unselectable", true);
+		}
+	}
+};
+
+DyCalendar.findMonth = function(el) {
+	if (typeof el.month != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.month != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+DyCalendar.findYear = function(el) {
+	if (typeof el.year != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.year != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+DyCalendar.showMonthsCombo = function () {
+	var cal = DyCalendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var mc = cal.monthsCombo;
+	if (cal.hilitedMonth) {
+		DyCalendar.removeClass(cal.hilitedMonth, "hilite");
+	}
+	if (cal.activeMonth) {
+		DyCalendar.removeClass(cal.activeMonth, "active");
+	}
+	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
+	DyCalendar.addClass(mon, "active");
+	cal.activeMonth = mon;
+	var s = mc.style;
+	s.display = "block";
+	if (cd.navtype < 0)
+		s.left = cd.offsetLeft + "px";
+	else {
+		var mcw = mc.offsetWidth;
+		if (typeof mcw == "undefined")
+			// Konqueror brain-dead techniques
+			mcw = 50;
+		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
+	}
+	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+};
+
+DyCalendar.showYearsCombo = function (fwd) {
+	var cal = DyCalendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var yc = cal.yearsCombo;
+	if (cal.hilitedYear) {
+		DyCalendar.removeClass(cal.hilitedYear, "hilite");
+	}
+	if (cal.activeYear) {
+		DyCalendar.removeClass(cal.activeYear, "active");
+	}
+	cal.activeYear = null;
+	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
+	var yr = yc.firstChild;
+	var show = false;
+	for (var i = 12; i > 0; --i) {
+		if (Y >= cal.minYear && Y <= cal.maxYear) {
+			yr.innerHTML = Y;
+			yr.year = Y;
+			yr.style.display = "block";
+			show = true;
+		} else {
+			yr.style.display = "none";
+		}
+		yr = yr.nextSibling;
+		Y += fwd ? cal.yearStep : -cal.yearStep;
+	}
+	if (show) {
+		var s = yc.style;
+		s.display = "block";
+		if (cd.navtype < 0)
+			s.left = cd.offsetLeft + "px";
+		else {
+			var ycw = yc.offsetWidth;
+			if (typeof ycw == "undefined")
+				// Konqueror brain-dead techniques
+				ycw = 50;
+			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
+		}
+		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+	}
+};
+
+// event handlers
+
+DyCalendar.tableMouseUp = function(ev) {
+	var cal = DyCalendar._C;
+	if (!cal) {
+		return false;
+	}
+	if (cal.timeout) {
+		clearTimeout(cal.timeout);
+	}
+	var el = cal.activeDiv;
+	if (!el) {
+		return false;
+	}
+	var target = DyCalendar.getTargetElement(ev);
+	ev || (ev = window.event);
+	DyCalendar.removeClass(el, "active");
+	if (target == el || target.parentNode == el) {
+		DyCalendar.cellClick(el, ev);
+	}
+	var mon = DyCalendar.findMonth(target);
+	var date = null;
+	if (mon) {
+		date = new Date(cal.date);
+		if (mon.month != date.getMonth()) {
+			date.setMonth(mon.month);
+			cal.setDate(date);
+			cal.dateClicked = false;
+			cal.callHandler();
+		}
+	} else {
+		var year = DyCalendar.findYear(target);
+		if (year) {
+			date = new Date(cal.date);
+			if (year.year != date.getFullYear()) {
+				date.setFullYear(year.year);
+				cal.setDate(date);
+				cal.dateClicked = false;
+				cal.callHandler();
+			}
+		}
+	}
+	with (DyCalendar) {
+		removeEvent(document, "mouseup", tableMouseUp);
+		removeEvent(document, "mouseover", tableMouseOver);
+		removeEvent(document, "mousemove", tableMouseOver);
+		cal._hideCombos();
+		_C = null;
+		return stopEvent(ev);
+	}
+};
+
+DyCalendar.tableMouseOver = function (ev) {
+	var cal = DyCalendar._C;
+	if (!cal) {
+		return;
+	}
+	var el = cal.activeDiv;
+	var target = DyCalendar.getTargetElement(ev);
+	if (target == el || target.parentNode == el) {
+		DyCalendar.addClass(el, "hilite active");
+		DyCalendar.addClass(el.parentNode, "rowhilite");
+	} else {
+		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
+			DyCalendar.removeClass(el, "active");
+		DyCalendar.removeClass(el, "hilite");
+		DyCalendar.removeClass(el.parentNode, "rowhilite");
+	}
+	ev || (ev = window.event);
+	if (el.navtype == 50 && target != el) {
+		var pos = DyCalendar.getAbsolutePos(el);
+		var w = el.offsetWidth;
+		var x = ev.clientX;
+		var dx;
+		var decrease = true;
+		if (x > pos.x + w) {
+			dx = x - pos.x - w;
+			decrease = false;
+		} else
+			dx = pos.x - x;
+
+		if (dx < 0) dx = 0;
+		var range = el._range;
+		var current = el._current;
+		var count = Math.floor(dx / 10) % range.length;
+		for (var i = range.length; --i >= 0;)
+			if (range[i] == current)
+				break;
+		while (count-- > 0)
+			if (decrease) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+		var newval = range[i];
+		el.innerHTML = newval;
+
+		cal.onUpdateTime();
+	}
+	var mon = DyCalendar.findMonth(target);
+	if (mon) {
+		if (mon.month != cal.date.getMonth()) {
+			if (cal.hilitedMonth) {
+				DyCalendar.removeClass(cal.hilitedMonth, "hilite");
+			}
+			DyCalendar.addClass(mon, "hilite");
+			cal.hilitedMonth = mon;
+		} else if (cal.hilitedMonth) {
+			DyCalendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+	} else {
+		if (cal.hilitedMonth) {
+			DyCalendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+		var year = DyCalendar.findYear(target);
+		if (year) {
+			if (year.year != cal.date.getFullYear()) {
+				if (cal.hilitedYear) {
+					DyCalendar.removeClass(cal.hilitedYear, "hilite");
+				}
+				DyCalendar.addClass(year, "hilite");
+				cal.hilitedYear = year;
+			} else if (cal.hilitedYear) {
+				DyCalendar.removeClass(cal.hilitedYear, "hilite");
+			}
+		} else if (cal.hilitedYear) {
+			DyCalendar.removeClass(cal.hilitedYear, "hilite");
+		}
+	}
+	return DyCalendar.stopEvent(ev);
+};
+
+DyCalendar.tableMouseDown = function (ev) {
+	if (DyCalendar.getTargetElement(ev) == DyCalendar.getElement(ev)) {
+		return DyCalendar.stopEvent(ev);
+	}
+};
+
+DyCalendar.calDragIt = function (ev) {
+	var cal = DyCalendar._C;
+	if (!(cal && cal.dragging)) {
+		return false;
+	}
+	var posX;
+	var posY;
+	if (DyCalendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posX = ev.pageX;
+		posY = ev.pageY;
+	}
+	cal.hideShowCovered();
+	var st = cal.element.style;
+	st.left = (posX - cal.xOffs) + "px";
+	st.top = (posY - cal.yOffs) + "px";
+	return DyCalendar.stopEvent(ev);
+};
+
+DyCalendar.calDragEnd = function (ev) {
+	var cal = DyCalendar._C;
+	if (!cal) {
+		return false;
+	}
+	cal.dragging = false;
+	with (DyCalendar) {
+		removeEvent(document, "mousemove", calDragIt);
+		removeEvent(document, "mouseup", calDragEnd);
+		tableMouseUp(ev);
+	}
+	cal.hideShowCovered();
+};
+
+DyCalendar.dayMouseDown = function(ev) {
+	var el = DyCalendar.getElement(ev);
+	if (el.disabled) {
+		return false;
+	}
+	var cal = el.calendar;
+	cal.activeDiv = el;
+	DyCalendar._C = cal;
+	if (el.navtype != 300) with (DyCalendar) {
+		if (el.navtype == 50) {
+			el._current = el.innerHTML;
+			addEvent(document, "mousemove", tableMouseOver);
+		} else
+			addEvent(document, DyCalendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
+		addClass(el, "hilite active");
+		addEvent(document, "mouseup", tableMouseUp);
+	} else if (cal.isPopup) {
+		cal._dragStart(ev);
+	}
+	if (el.navtype == -1 || el.navtype == 1) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout("DyCalendar.showMonthsCombo()", 250);
+	} else if (el.navtype == -2 || el.navtype == 2) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout((el.navtype > 0) ? "DyCalendar.showYearsCombo(true)" : "DyCalendar.showYearsCombo(false)", 250);
+	} else {
+		cal.timeout = null;
+	}
+	return DyCalendar.stopEvent(ev);
+};
+
+DyCalendar.dayMouseDblClick = function(ev) {
+	DyCalendar.cellClick(DyCalendar.getElement(ev), ev || window.event);
+	if (DyCalendar.is_ie) {
+		document.selection.empty();
+	}
+};
+
+DyCalendar.dayMouseOver = function(ev) {
+	var el = DyCalendar.getElement(ev);
+	if (DyCalendar.isRelated(el, ev) || DyCalendar._C || el.disabled) {
+		return false;
+	}
+	if (el.ttip) {
+		if (el.ttip.substr(0, 1) == "_") {
+			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
+		}
+		el.calendar.tooltips.innerHTML = el.ttip;
+	}
+	if (el.navtype != 300) {
+		DyCalendar.addClass(el, "hilite");
+		if (el.caldate) {
+			DyCalendar.addClass(el.parentNode, "rowhilite");
+		}
+	}
+	return DyCalendar.stopEvent(ev);
+};
+
+DyCalendar.dayMouseOut = function(ev) {
+	with (DyCalendar) {
+		var el = getElement(ev);
+		if (isRelated(el, ev) || _C || el.disabled)
+			return false;
+		removeClass(el, "hilite");
+		if (el.caldate)
+			removeClass(el.parentNode, "rowhilite");
+		if (el.calendar)
+			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
+		return stopEvent(ev);
+	}
+};
+
+/**
+ *  A generic "click" handler :) handles all types of buttons defined in this
+ *  calendar.
+ */
+DyCalendar.cellClick = function(el, ev) {
+	var cal = el.calendar;
+	var closing = false;
+	var newdate = false;
+	var date = null;
+	if (typeof el.navtype == "undefined") {
+		if (cal.currentDateEl) {
+			DyCalendar.removeClass(cal.currentDateEl, "selected");
+			DyCalendar.addClass(el, "selected");
+			closing = (cal.currentDateEl == el);
+			if (!closing) {
+				cal.currentDateEl = el;
+			}
+		}
+		cal.date.setDateOnly(el.caldate);
+		date = cal.date;
+		var other_month = !(cal.dateClicked = !el.otherMonth);
+		if (!other_month && !cal.currentDateEl)
+			cal._toggleMultipleDate(new Date(date));
+		else
+			newdate = !el.disabled;
+		// a date was clicked
+		if (other_month)
+			cal._init(cal.firstDayOfWeek, date);
+	} else {
+		if (el.navtype == 200) {
+			DyCalendar.removeClass(el, "hilite");
+			cal.callCloseHandler();
+			return;
+		}
+		date = new Date(cal.date);
+		if (el.navtype == 0)
+			date.setDateOnly(new Date()); // TODAY
+		// unless "today" was clicked, we assume no date was clicked so
+		// the selected handler will know not to close the calenar when
+		// in single-click mode.
+		// cal.dateClicked = (el.navtype == 0);
+		cal.dateClicked = false;
+		var year = date.getFullYear();
+		var mon = date.getMonth();
+		function setMonth(m) {
+			var day = date.getDate();
+			var max = date.getMonthDays(m);
+			if (day > max) {
+				date.setDate(max);
+			}
+			date.setMonth(m);
+		};
+		switch (el.navtype) {
+		    case 400:
+			DyCalendar.removeClass(el, "hilite");
+			var text = DyCalendar._TT["ABOUT"];
+			if (typeof text != "undefined") {
+				text += cal.showsTime ? DyCalendar._TT["ABOUT_TIME"] : "";
+			} else {
+				// FIXME: this should be removed as soon as lang files get updated!
+				text = "Help and about box text is not translated into this language.\n" +
+					"If you know this language and you feel generous please update\n" +
+					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
+					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
+					"Thank you!\n" +
+					"http://dynarch.com/mishoo/calendar.epl\n";
+			}
+			alert(text);
+			return;
+		    case -2:
+			if (year > cal.minYear) {
+				date.setFullYear(year - 1);
+			}
+			break;
+		    case -1:
+			if (mon > 0) {
+				setMonth(mon - 1);
+			} else if (year-- > cal.minYear) {
+				date.setFullYear(year);
+				setMonth(11);
+			}
+			break;
+		    case 1:
+			if (mon < 11) {
+				setMonth(mon + 1);
+			} else if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+				setMonth(0);
+			}
+			break;
+		    case 2:
+			if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+			}
+			break;
+		    case 100:
+			cal.setFirstDayOfWeek(el.fdow);
+			return;
+		    case 50:
+			var range = el._range;
+			var current = el.innerHTML;
+			for (var i = range.length; --i >= 0;)
+				if (range[i] == current)
+					break;
+			if (ev && ev.shiftKey) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+			var newval = range[i];
+			el.innerHTML = newval;
+			cal.onUpdateTime();
+			return;
+		    case 0:
+			// TODAY will bring us here
+			if ((typeof cal.getDateStatus == "function") &&
+			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
+				return false;
+			}
+			break;
+		}
+		if (!date.equalsTo(cal.date)) {
+			cal.setDate(date);
+			newdate = true;
+		} else if (el.navtype == 0)
+			newdate = closing = true;
+	}
+	if (newdate) {
+		ev && cal.callHandler();
+	}
+	if (closing) {
+		DyCalendar.removeClass(el, "hilite");
+		ev && cal.callCloseHandler();
+	}
+};
+
+// END: CALENDAR STATIC FUNCTIONS
+
+// BEGIN: CALENDAR OBJECT FUNCTIONS
+
+/**
+ *  This function creates the calendar inside the given parent.  If _par is
+ *  null than it creates a popup calendar inside the BODY element.  If _par is
+ *  an element, be it BODY, then it creates a non-popup calendar (still
+ *  hidden).  Some properties need to be set before calling this function.
+ */
+DyCalendar.prototype.create = function (_par) {
+	var parent = null;
+	if (! _par) {
+		// default parent is the document body, in which case we create
+		// a popup calendar.
+		parent = document.getElementsByTagName("body")[0];
+		this.isPopup = true;
+	} else {
+		parent = _par;
+		this.isPopup = false;
+	}
+	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
+
+	var table = DyCalendar.createElement("table");
+	this.table = table;
+	table.cellSpacing = 0;
+	table.cellPadding = 0;
+	table.calendar = this;
+	DyCalendar.addEvent(table, "mousedown", DyCalendar.tableMouseDown);
+
+	var div = DyCalendar.createElement("div");
+	this.element = div;
+	div.className = "calendar";
+	if (this.isPopup) {
+		div.style.position = "absolute";
+		div.style.display = "none";
+	}
+	div.appendChild(table);
+
+	var thead = DyCalendar.createElement("thead", table);
+	var cell = null;
+	var row = null;
+
+	var cal = this;
+	var hh = function (text, cs, navtype) {
+		cell = DyCalendar.createElement("td", row);
+		cell.colSpan = cs;
+		cell.className = "button";
+		if (navtype != 0 && Math.abs(navtype) <= 2)
+			cell.className += " nav";
+		DyCalendar._add_evs(cell);
+		cell.calendar = cal;
+		cell.navtype = navtype;
+		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
+		return cell;
+	};
+
+	row = DyCalendar.createElement("tr", thead);
+	var title_length = 6;
+	(this.isPopup) && --title_length;
+	(this.weekNumbers) && ++title_length;
+
+	hh("?", 1, 400).ttip = DyCalendar._TT["INFO"];
+	this.title = hh("", title_length, 300);
+	this.title.className = "title";
+	if (this.isPopup) {
+		this.title.ttip = DyCalendar._TT["DRAG_TO_MOVE"];
+		this.title.style.cursor = "move";
+		hh("&#x00d7;", 1, 200).ttip = DyCalendar._TT["CLOSE"];
+	}
+
+	row = DyCalendar.createElement("tr", thead);
+	row.className = "headrow";
+
+	this._nav_py = hh("&#x00ab;", 1, -2);
+	this._nav_py.ttip = DyCalendar._TT["PREV_YEAR"];
+
+	this._nav_pm = hh("&#x2039;", 1, -1);
+	this._nav_pm.ttip = DyCalendar._TT["PREV_MONTH"];
+
+	this._nav_now = hh(DyCalendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
+	this._nav_now.ttip = DyCalendar._TT["GO_TODAY"];
+
+	this._nav_nm = hh("&#x203a;", 1, 1);
+	this._nav_nm.ttip = DyCalendar._TT["NEXT_MONTH"];
+
+	this._nav_ny = hh("&#x00bb;", 1, 2);
+	this._nav_ny.ttip = DyCalendar._TT["NEXT_YEAR"];
+
+	// day names
+	row = DyCalendar.createElement("tr", thead);
+	row.className = "daynames";
+	if (this.weekNumbers) {
+		cell = DyCalendar.createElement("td", row);
+		cell.className = "name wn";
+		cell.innerHTML = DyCalendar._TT["WK"];
+	}
+	for (var i = 7; i > 0; --i) {
+		cell = DyCalendar.createElement("td", row);
+		if (!i) {
+			cell.navtype = 100;
+			cell.calendar = this;
+			DyCalendar._add_evs(cell);
+		}
+	}
+	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
+	this._displayWeekdays();
+
+	var tbody = DyCalendar.createElement("tbody", table);
+	this.tbody = tbody;
+
+	for (i = 6; i > 0; --i) {
+		row = DyCalendar.createElement("tr", tbody);
+		if (this.weekNumbers) {
+			cell = DyCalendar.createElement("td", row);
+		}
+		for (var j = 7; j > 0; --j) {
+			cell = DyCalendar.createElement("td", row);
+			cell.calendar = this;
+			DyCalendar._add_evs(cell);
+		}
+	}
+
+	if (this.showsTime) {
+		row = DyCalendar.createElement("tr", tbody);
+		row.className = "time";
+
+		cell = DyCalendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = 2;
+		cell.innerHTML = DyCalendar._TT["TIME"] || "&nbsp;";
+
+		cell = DyCalendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = this.weekNumbers ? 4 : 3;
+
+		(function(){
+			function makeTimePart(className, init, range_start, range_end) {
+				var part = DyCalendar.createElement("span", cell);
+				part.className = className;
+				part.innerHTML = init;
+				part.calendar = cal;
+				part.ttip = DyCalendar._TT["TIME_PART"];
+				part.navtype = 50;
+				part._range = [];
+				if (typeof range_start != "number")
+					part._range = range_start;
+				else {
+					for (var i = range_start; i <= range_end; ++i) {
+						var txt;
+						if (i < 10 && range_end >= 10) txt = '0' + i;
+						else txt = '' + i;
+						part._range[part._range.length] = txt;
+					}
+				}
+				DyCalendar._add_evs(part);
+				return part;
+			};
+			var hrs = cal.date.getHours();
+			var mins = cal.date.getMinutes();
+			var t12 = !cal.time24;
+			var pm = (hrs > 12);
+			if (t12 && pm) hrs -= 12;
+			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
+			var span = DyCalendar.createElement("span", cell);
+			span.innerHTML = ":";
+			span.className = "colon";
+			var M = makeTimePart("minute", mins, 0, 59);
+			var AP = null;
+			cell = DyCalendar.createElement("td", row);
+			cell.className = "time";
+			cell.colSpan = 2;
+			if (t12)
+				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
+			else
+				cell.innerHTML = "&nbsp;";
+
+			cal.onSetTime = function() {
+				var pm, hrs = this.date.getHours(),
+					mins = this.date.getMinutes();
+				if (t12) {
+					pm = (hrs >= 12);
+					if (pm) hrs -= 12;
+					if (hrs == 0) hrs = 12;
+					AP.innerHTML = pm ? "pm" : "am";
+				}
+				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
+				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
+			};
+
+			cal.onUpdateTime = function() {
+				var date = this.date;
+				var h = parseInt(H.innerHTML, 10);
+				if (t12) {
+					if (/pm/i.test(AP.innerHTML) && h < 12)
+						h += 12;
+					else if (/am/i.test(AP.innerHTML) && h == 12)
+						h = 0;
+				}
+				var d = date.getDate();
+				var m = date.getMonth();
+				var y = date.getFullYear();
+				date.setHours(h);
+				date.setMinutes(parseInt(M.innerHTML, 10));
+				date.setFullYear(y);
+				date.setMonth(m);
+				date.setDate(d);
+				this.dateClicked = false;
+				this.callHandler();
+			};
+		})();
+	} else {
+		this.onSetTime = this.onUpdateTime = function() {};
+	}
+
+	var tfoot = DyCalendar.createElement("tfoot", table);
+
+	row = DyCalendar.createElement("tr", tfoot);
+	row.className = "footrow";
+
+	cell = hh(DyCalendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
+	cell.className = "ttip";
+	if (this.isPopup) {
+		cell.ttip = DyCalendar._TT["DRAG_TO_MOVE"];
+		cell.style.cursor = "move";
+	}
+	this.tooltips = cell;
+
+	div = DyCalendar.createElement("div", this.element);
+	this.monthsCombo = div;
+	div.className = "combo";
+	for (i = 0; i < DyCalendar._MN.length; ++i) {
+		var mn = DyCalendar.createElement("div");
+		mn.className = DyCalendar.is_ie ? "label-IEfix" : "label";
+		mn.month = i;
+		mn.innerHTML = DyCalendar._SMN[i];
+		div.appendChild(mn);
+	}
+
+	div = DyCalendar.createElement("div", this.element);
+	this.yearsCombo = div;
+	div.className = "combo";
+	for (i = 12; i > 0; --i) {
+		var yr = DyCalendar.createElement("div");
+		yr.className = DyCalendar.is_ie ? "label-IEfix" : "label";
+		div.appendChild(yr);
+	}
+
+	this._init(this.firstDayOfWeek, this.date);
+	parent.appendChild(this.element);
+};
+
+/** keyboard navigation, only for popup calendars */
+DyCalendar._keyEvent = function(ev) {
+	var cal = window._dynarch_popupDyCalendar;
+	if (!cal || cal.multiple)
+		return false;
+	(DyCalendar.is_ie) && (ev = window.event);
+	var act = (DyCalendar.is_ie || ev.type == "keypress"),
+		K = ev.keyCode;
+	if (ev.ctrlKey) {
+		switch (K) {
+		    case 37: // KEY left
+			act && DyCalendar.cellClick(cal._nav_pm);
+			break;
+		    case 38: // KEY up
+			act && DyCalendar.cellClick(cal._nav_py);
+			break;
+		    case 39: // KEY right
+			act && DyCalendar.cellClick(cal._nav_nm);
+			break;
+		    case 40: // KEY down
+			act && DyCalendar.cellClick(cal._nav_ny);
+			break;
+		    default:
+			return false;
+		}
+	} else switch (K) {
+	    case 32: // KEY space (now)
+		DyCalendar.cellClick(cal._nav_now);
+		break;
+	    case 27: // KEY esc
+		act && cal.callCloseHandler();
+		break;
+	    case 37: // KEY left
+	    case 38: // KEY up
+	    case 39: // KEY right
+	    case 40: // KEY down
+		if (act) {
+			var prev, x, y, ne, el, step;
+			prev = K == 37 || K == 38;
+			step = (K == 37 || K == 39) ? 1 : 7;
+			function setVars() {
+				el = cal.currentDateEl;
+				var p = el.pos;
+				x = p & 15;
+				y = p >> 4;
+				ne = cal.ar_days[y][x];
+			};setVars();
+			function prevMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() - step);
+				cal.setDate(date);
+			};
+			function nextMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() + step);
+				cal.setDate(date);
+			};
+			while (1) {
+				switch (K) {
+				    case 37: // KEY left
+					if (--x >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 6;
+						K = 38;
+						continue;
+					}
+					break;
+				    case 38: // KEY up
+					if (--y >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						prevMonth();
+						setVars();
+					}
+					break;
+				    case 39: // KEY right
+					if (++x < 7)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 0;
+						K = 40;
+						continue;
+					}
+					break;
+				    case 40: // KEY down
+					if (++y < cal.ar_days.length)
+						ne = cal.ar_days[y][x];
+					else {
+						nextMonth();
+						setVars();
+					}
+					break;
+				}
+				break;
+			}
+			if (ne) {
+				if (!ne.disabled)
+					DyCalendar.cellClick(ne);
+				else if (prev)
+					prevMonth();
+				else
+					nextMonth();
+			}
+		}
+		break;
+	    case 13: // KEY enter
+		if (act)
+			DyCalendar.cellClick(cal.currentDateEl, ev);
+		break;
+	    default:
+		return false;
+	}
+	return DyCalendar.stopEvent(ev);
+};
+
+/**
+ *  (RE)Initializes the calendar to the given date and firstDayOfWeek
+ */
+DyCalendar.prototype._init = function (firstDayOfWeek, date) {
+	var today = new Date(),
+		TY = today.getFullYear(),
+		TM = today.getMonth(),
+		TD = today.getDate();
+	this.table.style.visibility = "hidden";
+	var year = date.getFullYear();
+	if (year < this.minYear) {
+		year = this.minYear;
+		date.setFullYear(year);
+	} else if (year > this.maxYear) {
+		year = this.maxYear;
+		date.setFullYear(year);
+	}
+	this.firstDayOfWeek = firstDayOfWeek;
+	this.date = new Date(date);
+	var month = date.getMonth();
+	var mday = date.getDate();
+	var no_days = date.getMonthDays();
+
+	// calendar voodoo for computing the first day that would actually be
+	// displayed in the calendar, even if it's from the previous month.
+	// WARNING: this is magic. ;-)
+	date.setDate(1);
+	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
+	if (day1 < 0)
+		day1 += 7;
+	date.setDate(-day1);
+	date.setDate(date.getDate() + 1);
+
+	var row = this.tbody.firstChild;
+	var MN = DyCalendar._SMN[month];
+	var ar_days = this.ar_days = new Array();
+	var weekend = DyCalendar._TT["WEEKEND"];
+	var dates = this.multiple ? (this.datesCells = {}) : null;
+	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
+		var cell = row.firstChild;
+		if (this.weekNumbers) {
+			cell.className = "day wn";
+			cell.innerHTML = date.getWeekNumber();
+			cell = cell.nextSibling;
+		}
+		row.className = "daysrow";
+		var hasdays = false, iday, dpos = ar_days[i] = [];
+		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
+			iday = date.getDate();
+			var wday = date.getDay();
+			cell.className = "day";
+			cell.pos = i << 4 | j;
+			dpos[j] = cell;
+			var current_month = (date.getMonth() == month);
+			if (!current_month) {
+				if (this.showsOtherMonths) {
+					cell.className += " othermonth";
+					cell.otherMonth = true;
+				} else {
+					cell.className = "emptycell";
+					cell.innerHTML = "&nbsp;";
+					cell.disabled = true;
+					continue;
+				}
+			} else {
+				cell.otherMonth = false;
+				hasdays = true;
+			}
+			cell.disabled = false;
+			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
+			if (dates)
+				dates[date.print("%Y%m%d")] = cell;
+			if (this.getDateStatus) {
+				var status = this.getDateStatus(date, year, month, iday);
+				if (this.getDateToolTip) {
+					var toolTip = this.getDateToolTip(date, year, month, iday);
+					if (toolTip)
+						cell.title = toolTip;
+				}
+				if (status === true) {
+					cell.className += " disabled";
+					cell.disabled = true;
+				} else {
+					if (/disabled/i.test(status))
+						cell.disabled = true;
+					cell.className += " " + status;
+				}
+			}
+			if (!cell.disabled) {
+				cell.caldate = new Date(date);
+				cell.ttip = "_";
+				if (!this.multiple && current_month
+				    && iday == mday && this.hiliteToday) {
+					cell.className += " selected";
+					this.currentDateEl = cell;
+				}
+				if (date.getFullYear() == TY &&
+				    date.getMonth() == TM &&
+				    iday == TD) {
+					cell.className += " today";
+					cell.ttip += DyCalendar._TT["PART_TODAY"];
+				}
+				if (weekend.indexOf(wday.toString()) != -1)
+					cell.className += cell.otherMonth ? " oweekend" : " weekend";
+			}
+		}
+		if (!(hasdays || this.showsOtherMonths))
+			row.className = "emptyrow";
+	}
+	this.title.innerHTML = DyCalendar._MN[month] + ", " + year;
+	this.onSetTime();
+	this.table.style.visibility = "visible";
+	this._initMultipleDates();
+	// PROFILE
+	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
+};
+
+DyCalendar.prototype._initMultipleDates = function() {
+	if (this.multiple) {
+		for (var i in this.multiple) {
+			var cell = this.datesCells[i];
+			var d = this.multiple[i];
+			if (!d)
+				continue;
+			if (cell)
+				cell.className += " selected";
+		}
+	}
+};
+
+DyCalendar.prototype._toggleMultipleDate = function(date) {
+	if (this.multiple) {
+		var ds = date.print("%Y%m%d");
+		var cell = this.datesCells[ds];
+		if (cell) {
+			var d = this.multiple[ds];
+			if (!d) {
+				DyCalendar.addClass(cell, "selected");
+				this.multiple[ds] = date;
+			} else {
+				DyCalendar.removeClass(cell, "selected");
+				delete this.multiple[ds];
+			}
+		}
+	}
+};
+
+DyCalendar.prototype.setDateToolTipHandler = function (unaryFunction) {
+	this.getDateToolTip = unaryFunction;
+};
+
+/**
+ *  Calls _init function above for going to a certain date (but only if the
+ *  date is different than the currently selected one).
+ */
+DyCalendar.prototype.setDate = function (date) {
+	if (!date.equalsTo(this.date)) {
+		this._init(this.firstDayOfWeek, date);
+	}
+};
+
+/**
+ *  Refreshes the calendar.  Useful if the "disabledHandler" function is
+ *  dynamic, meaning that the list of disabled date can change at runtime.
+ *  Just * call this function if you think that the list of disabled dates
+ *  should * change.
+ */
+DyCalendar.prototype.refresh = function () {
+	this._init(this.firstDayOfWeek, this.date);
+};
+
+/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
+DyCalendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
+	this._init(firstDayOfWeek, this.date);
+	this._displayWeekdays();
+};
+
+/**
+ *  Allows customization of what dates are enabled.  The "unaryFunction"
+ *  parameter must be a function object that receives the date (as a JS Date
+ *  object) and returns a boolean value.  If the returned value is true then
+ *  the passed date will be marked as disabled.
+ */
+DyCalendar.prototype.setDateStatusHandler = DyCalendar.prototype.setDisabledHandler = function (unaryFunction) {
+	this.getDateStatus = unaryFunction;
+};
+
+/** Customization of allowed year range for the calendar. */
+DyCalendar.prototype.setRange = function (a, z) {
+	this.minYear = a;
+	this.maxYear = z;
+};
+
+/** Calls the first user handler (selectedHandler). */
+DyCalendar.prototype.callHandler = function () {
+	if (this.onSelected) {
+		this.onSelected(this, this.date.print(this.dateFormat));
+	}
+};
+
+/** Calls the second user handler (closeHandler). */
+DyCalendar.prototype.callCloseHandler = function () {
+	if (this.onClose) {
+		this.onClose(this);
+	}
+	this.hideShowCovered();
+};
+
+/** Removes the calendar object from the DOM tree and destroys it. */
+DyCalendar.prototype.destroy = function () {
+	var el = this.element.parentNode;
+	el.removeChild(this.element);
+	DyCalendar._C = null;
+	window._dynarch_popupDyCalendar = null;
+};
+
+/**
+ *  Moves the calendar element to a different section in the DOM tree (changes
+ *  its parent).
+ */
+DyCalendar.prototype.reparent = function (new_parent) {
+	var el = this.element;
+	el.parentNode.removeChild(el);
+	new_parent.appendChild(el);
+};
+
+// This gets called when the user presses a mouse button anywhere in the
+// document, if the calendar is shown.  If the click was outside the open
+// calendar this function closes it.
+DyCalendar._checkDyCalendar = function(ev) {
+	var calendar = window._dynarch_popupDyCalendar;
+	if (!calendar) {
+		return false;
+	}
+	var el = DyCalendar.is_ie ? DyCalendar.getElement(ev) : DyCalendar.getTargetElement(ev);
+	for (; el != null && el != calendar.element; el = el.parentNode);
+	if (el == null) {
+		// calls closeHandler which should hide the calendar.
+		window._dynarch_popupDyCalendar.callCloseHandler();
+		return DyCalendar.stopEvent(ev);
+	}
+};
+
+/** Shows the calendar. */
+DyCalendar.prototype.show = function () {
+	var rows = this.table.getElementsByTagName("tr");
+	for (var i = rows.length; i > 0;) {
+		var row = rows[--i];
+		DyCalendar.removeClass(row, "rowhilite");
+		var cells = row.getElementsByTagName("td");
+		for (var j = cells.length; j > 0;) {
+			var cell = cells[--j];
+			DyCalendar.removeClass(cell, "hilite");
+			DyCalendar.removeClass(cell, "active");
+		}
+	}
+	this.element.style.display = "block";
+	this.hidden = false;
+	if (this.isPopup) {
+		window._dynarch_popupDyCalendar = this;
+		DyCalendar.addEvent(document, "keydown", DyCalendar._keyEvent);
+		DyCalendar.addEvent(document, "keypress", DyCalendar._keyEvent);
+		DyCalendar.addEvent(document, "mousedown", DyCalendar._checkDyCalendar);
+	}
+	this.hideShowCovered();
+};
+
+/**
+ *  Hides the calendar.  Also removes any "hilite" from the class of any TD
+ *  element.
+ */
+DyCalendar.prototype.hide = function () {
+	if (this.isPopup) {
+		DyCalendar.removeEvent(document, "keydown", DyCalendar._keyEvent);
+		DyCalendar.removeEvent(document, "keypress", DyCalendar._keyEvent);
+		DyCalendar.removeEvent(document, "mousedown", DyCalendar._checkDyCalendar);
+	}
+	this.element.style.display = "none";
+	this.hidden = true;
+	this.hideShowCovered();
+};
+
+/**
+ *  Shows the calendar at a given absolute position (beware that, depending on
+ *  the calendar element style -- position property -- this might be relative
+ *  to the parent's containing rectangle).
+ */
+DyCalendar.prototype.showAt = function (x, y) {
+	var s = this.element.style;
+	s.left = x + "px";
+	s.top = y + "px";
+	this.show();
+};
+
+/** Shows the calendar near a given element. */
+DyCalendar.prototype.showAtElement = function (el, opts) {
+	var self = this;
+	var p = DyCalendar.getAbsolutePos(el);
+	if (!opts || typeof opts != "string") {
+		this.showAt(p.x, p.y + el.offsetHeight);
+		return true;
+	}
+	function fixPosition(box) {
+		if (box.x < 0)
+			box.x = 0;
+		if (box.y < 0)
+			box.y = 0;
+		var cp = document.createElement("div");
+		var s = cp.style;
+		s.position = "absolute";
+		s.right = s.bottom = s.width = s.height = "0px";
+		document.body.appendChild(cp);
+		var br = DyCalendar.getAbsolutePos(cp);
+		document.body.removeChild(cp);
+		if (DyCalendar.is_ie) {
+			br.y += document.body.scrollTop;
+			br.x += document.body.scrollLeft;
+		} else {
+			br.y += window.scrollY;
+			br.x += window.scrollX;
+		}
+		var tmp = box.x + box.width - br.x;
+		if (tmp > 0) box.x -= tmp;
+		tmp = box.y + box.height - br.y;
+		if (tmp > 0) box.y -= tmp;
+	};
+	this.element.style.display = "block";
+	DyCalendar.continuation_for_the_fucking_khtml_browser = function() {
+		var w = self.element.offsetWidth;
+		var h = self.element.offsetHeight;
+		self.element.style.display = "none";
+		var valign = opts.substr(0, 1);
+		var halign = "l";
+		if (opts.length > 1) {
+			halign = opts.substr(1, 1);
+		}
+		// vertical alignment
+		switch (valign) {
+		    case "T": p.y -= h; break;
+		    case "B": p.y += el.offsetHeight; break;
+		    case "C": p.y += (el.offsetHeight - h) / 2; break;
+		    case "t": p.y += el.offsetHeight - h; break;
+		    case "b": break; // already there
+		}
+		// horizontal alignment
+		switch (halign) {
+		    case "L": p.x -= w; break;
+		    case "R": p.x += el.offsetWidth; break;
+		    case "C": p.x += (el.offsetWidth - w) / 2; break;
+		    case "l": p.x += el.offsetWidth - w; break;
+		    case "r": break; // already there
+		}
+		p.width = w;
+		p.height = h + 40;
+		self.monthsCombo.style.display = "none";
+		fixPosition(p);
+		self.showAt(p.x, p.y);
+	};
+	if (DyCalendar.is_khtml)
+		setTimeout("DyCalendar.continuation_for_the_fucking_khtml_browser()", 10);
+	else
+		DyCalendar.continuation_for_the_fucking_khtml_browser();
+};
+
+/** Customizes the date format. */
+DyCalendar.prototype.setDateFormat = function (str) {
+	this.dateFormat = str;
+};
+
+/** Customizes the tooltip date format. */
+DyCalendar.prototype.setTtDateFormat = function (str) {
+	this.ttDateFormat = str;
+};
+
+/**
+ *  Tries to identify the date represented in a string.  If successful it also
+ *  calls this.setDate which moves the calendar to the given date.
+ */
+DyCalendar.prototype.parseDate = function(str, fmt) {
+	if (!fmt)
+		fmt = this.dateFormat;
+	this.setDate(Date.parseDate(str, fmt));
+};
+
+DyCalendar.prototype.hideShowCovered = function () {
+	if (!DyCalendar.is_ie && !DyCalendar.is_opera)
+		return;
+	function getVisib(obj){
+		var value = obj.style.visibility;
+		if (!value) {
+			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+				if (!DyCalendar.is_khtml)
+					value = document.defaultView.
+						getComputedStyle(obj, "").getPropertyValue("visibility");
+				else
+					value = '';
+			} else if (obj.currentStyle) { // IE
+				value = obj.currentStyle.visibility;
+			} else
+				value = '';
+		}
+		return value;
+	};
+
+	var tags = new Array("applet", "iframe", "select");
+	var el = this.element;
+
+	var p = DyCalendar.getAbsolutePos(el);
+	var EX1 = p.x;
+	var EX2 = el.offsetWidth + EX1;
+	var EY1 = p.y;
+	var EY2 = el.offsetHeight + EY1;
+
+	for (var k = tags.length; k > 0; ) {
+		var ar = document.getElementsByTagName(tags[--k]);
+		var cc = null;
+
+		for (var i = ar.length; i > 0;) {
+			cc = ar[--i];
+
+			p = DyCalendar.getAbsolutePos(cc);
+			var CX1 = p.x;
+			var CX2 = cc.offsetWidth + CX1;
+			var CY1 = p.y;
+			var CY2 = cc.offsetHeight + CY1;
+
+			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = cc.__msh_save_visibility;
+			} else {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = "hidden";
+			}
+		}
+	}
+};
+
+/** Internal function; it displays the bar with the names of the weekday. */
+DyCalendar.prototype._displayWeekdays = function () {
+	var fdow = this.firstDayOfWeek;
+	var cell = this.firstdayname;
+	var weekend = DyCalendar._TT["WEEKEND"];
+	for (var i = 0; i < 7; ++i) {
+		cell.className = "day name";
+		var realday = (i + fdow) % 7;
+		if (i) {
+			cell.ttip = DyCalendar._TT["DAY_FIRST"].replace("%s", DyCalendar._DN[realday]);
+			cell.navtype = 100;
+			cell.calendar = this;
+			cell.fdow = realday;
+			DyCalendar._add_evs(cell);
+		}
+		if (weekend.indexOf(realday.toString()) != -1) {
+			DyCalendar.addClass(cell, "weekend");
+		}
+		cell.innerHTML = DyCalendar._SDN[(i + fdow) % 7];
+		cell = cell.nextSibling;
+	}
+};
+
+/** Internal function.  Hides all combo boxes that might be displayed. */
+DyCalendar.prototype._hideCombos = function () {
+	this.monthsCombo.style.display = "none";
+	this.yearsCombo.style.display = "none";
+};
+
+/** Internal function.  Starts dragging the element. */
+DyCalendar.prototype._dragStart = function (ev) {
+	if (this.dragging) {
+		return;
+	}
+	this.dragging = true;
+	var posX;
+	var posY;
+	if (DyCalendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posY = ev.clientY + window.scrollY;
+		posX = ev.clientX + window.scrollX;
+	}
+	var st = this.element.style;
+	this.xOffs = posX - parseInt(st.left);
+	this.yOffs = posY - parseInt(st.top);
+	with (DyCalendar) {
+		addEvent(document, "mousemove", calDragIt);
+		addEvent(document, "mouseup", calDragEnd);
+	}
+};
+
+// BEGIN: DATE OBJECT PATCHES
+
+/** Adds the number of days array to the Date object. */
+Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
+
+/** Constants used for time computations */
+Date.SECOND = 1000 /* milliseconds */;
+Date.MINUTE = 60 * Date.SECOND;
+Date.HOUR   = 60 * Date.MINUTE;
+Date.DAY    = 24 * Date.HOUR;
+Date.WEEK   =  7 * Date.DAY;
+
+Date.parseDate = function(str, fmt) {
+	var today = new Date();
+	var y = 0;
+	var m = -1;
+	var d = 0;
+	var a = str.split(/\W+/);
+	var b = fmt.match(/%./g);
+	var i = 0, j = 0;
+	var hr = 0;
+	var min = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (!a[i])
+			continue;
+		switch (b[i]) {
+		    case "%d":
+		    case "%e":
+			d = parseInt(a[i], 10);
+			break;
+
+		    case "%m":
+			m = parseInt(a[i], 10) - 1;
+			break;
+
+		    case "%Y":
+		    case "%y":
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+			break;
+
+		    case "%b":
+		    case "%B":
+			for (j = 0; j < 12; ++j) {
+				if (DyCalendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+			}
+			break;
+
+		    case "%H":
+		    case "%I":
+		    case "%k":
+		    case "%l":
+			hr = parseInt(a[i], 10);
+			break;
+
+		    case "%P":
+		    case "%p":
+			if (/pm/i.test(a[i]) && hr < 12)
+				hr += 12;
+			else if (/am/i.test(a[i]) && hr >= 12)
+				hr -= 12;
+			break;
+
+		    case "%M":
+			min = parseInt(a[i], 10);
+			break;
+		}
+	}
+	if (isNaN(y)) y = today.getFullYear();
+	if (isNaN(m)) m = today.getMonth();
+	if (isNaN(d)) d = today.getDate();
+	if (isNaN(hr)) hr = today.getHours();
+	if (isNaN(min)) min = today.getMinutes();
+	if (y != 0 && m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	y = 0; m = -1; d = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (a[i].search(/[a-zA-Z]+/) != -1) {
+			var t = -1;
+			for (j = 0; j < 12; ++j) {
+				if (DyCalendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+			}
+			if (t != -1) {
+				if (m != -1) {
+					d = m+1;
+				}
+				m = t;
+			}
+		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
+			m = a[i]-1;
+		} else if (parseInt(a[i], 10) > 31 && y == 0) {
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+		} else if (d == 0) {
+			d = a[i];
+		}
+	}
+	if (y == 0)
+		y = today.getFullYear();
+	if (m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	return today;
+};
+
+/** Returns the number of days in the current month */
+Date.prototype.getMonthDays = function(month) {
+	var year = this.getFullYear();
+	if (typeof month == "undefined") {
+		month = this.getMonth();
+	}
+	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+		return 29;
+	} else {
+		return Date._MD[month];
+	}
+};
+
+/** Returns the number of day in the year. */
+Date.prototype.getDayOfYear = function() {
+	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+	var time = now - then;
+	return Math.floor(time / Date.DAY);
+};
+
+/** Returns the number of the week in year, as defined in ISO 8601. */
+Date.prototype.getWeekNumber = function() {
+	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var DoW = d.getDay();
+	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
+	var ms = d.valueOf(); // GMT
+	d.setMonth(0);
+	d.setDate(4); // Thu in Week 1
+	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+};
+
+/** Checks date and time equality */
+Date.prototype.equalsTo = function(date) {
+	return ((this.getFullYear() == date.getFullYear()) &&
+		(this.getMonth() == date.getMonth()) &&
+		(this.getDate() == date.getDate()) &&
+		(this.getHours() == date.getHours()) &&
+		(this.getMinutes() == date.getMinutes()));
+};
+
+/** Set only the year, month, date parts (keep existing time) */
+Date.prototype.setDateOnly = function(date) {
+	var tmp = new Date(date);
+	this.setDate(1);
+	this.setFullYear(tmp.getFullYear());
+	this.setMonth(tmp.getMonth());
+	this.setDate(tmp.getDate());
+};
+
+/** Prints the date in a string according to the given format. */
+Date.prototype.print = function (str) {
+	var m = this.getMonth();
+	var d = this.getDate();
+	var y = this.getFullYear();
+	var wn = this.getWeekNumber();
+	var w = this.getDay();
+	var s = {};
+	var hr = this.getHours();
+	var pm = (hr >= 12);
+	var ir = (pm) ? (hr - 12) : hr;
+	var dy = this.getDayOfYear();
+	if (ir == 0)
+		ir = 12;
+	var min = this.getMinutes();
+	var sec = this.getSeconds();
+	s["%a"] = DyCalendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
+	s["%A"] = DyCalendar._DN[w]; // full weekday name
+	s["%b"] = DyCalendar._SMN[m]; // abbreviated month name [FIXME: I18N]
+	s["%B"] = DyCalendar._MN[m]; // full month name
+	// FIXME: %c : preferred date and time representation for the current locale
+	s["%C"] = 1 + Math.floor(y / 100); // the century number
+	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
+	s["%e"] = d; // the day of the month (range 1 to 31)
+	// FIXME: %D : american date style: %m/%d/%y
+	// FIXME: %E, %F, %G, %g, %h (man strftime)
+	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
+	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
+	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
+	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
+	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
+	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
+	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
+	s["%n"] = "\n";		// a newline character
+	s["%p"] = pm ? "PM" : "AM";
+	s["%P"] = pm ? "pm" : "am";
+	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+	// FIXME: %R : the time in 24-hour notation %H:%M
+	s["%s"] = Math.floor(this.getTime() / 1000);
+	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
+	s["%t"] = "\t";		// a tab character
+	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
+	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
+	// FIXME: %x : preferred date representation for the current locale without the time
+	// FIXME: %X : preferred time representation for the current locale without the date
+	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
+	s["%Y"] = y;		// year with the century
+	s["%%"] = "%";		// a literal '%' character
+
+	var re = /%./g;
+	if (!DyCalendar.is_ie5 && !DyCalendar.is_khtml)
+		return str.replace(re, function (par) { return s[par] || par; });
+
+	var a = str.match(re);
+	for (var i = 0; i < a.length; i++) {
+		var tmp = s[a[i]];
+		if (tmp) {
+			re = new RegExp(a[i], 'g');
+			str = str.replace(re, tmp);
+		}
+	}
+
+	return str;
+};
+
+Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
+Date.prototype.setFullYear = function(y) {
+	var d = new Date(this);
+	d.__msh_oldSetFullYear(y);
+	if (d.getMonth() != this.getMonth())
+		this.setDate(28);
+	this.__msh_oldSetFullYear(y);
+};
+
+// END: DATE OBJECT PATCHES
+
+
+// global object that remembers the calendar
+window._dynarch_popupDyCalendar = null;
diff --git a/common/js/calendar.min.js b/common/js/calendar.min.js
new file mode 100644
index 000000000..50ae2ae74
--- /dev/null
+++ b/common/js/calendar.min.js
@@ -0,0 +1,18 @@
+/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
+ * -----------------------------------------------------------
+ *
+ * The DHTML Calendar, version 1.0 "It is happening again"
+ *
+ * Details and latest version at:
+ * www.dynarch.com/projects/calendar
+ *
+ * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ */
+
+// $Id: calendar.js,v 1.51 2005/03/07 16:44:31 mishoo Exp $
+
+/** The Calendar object constructor. */
+DyCalendar=function(firstDayOfWeek,dateStr,onSelected,onClose){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.getDateToolTip=null;this.getDateText=null;this.timeout=null;this.onSelected=onSelected||null;this.onClose=onClose||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=DyCalendar._TT["DEF_DATE_FORMAT"];this.ttDateFormat=DyCalendar._TT["TT_DATE_FORMAT"];this.isPopup=true;this.weekNumbers=true;this.firstDayOfWeek=typeof firstDayOfWeek=="number"?firstDayOfWeek:DyCalendar._FD;this.showsOtherMonths=false;this.dateStr=dateStr;this.ar_days=null;this.showsTime=false;this.time24=true;this.yearStep=2;this.hiliteToday=true;this.multiple=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof DyCalendar._SDN=="undefined"){if(typeof DyCalendar._SDN_len=="undefined")DyCalendar._SDN_len=3;var ar=new Array();for(var i=8;i>0;){ar[--i]=DyCalendar._DN[i].substr(0,DyCalendar._SDN_len)}DyCalendar._SDN=ar;if(typeof DyCalendar._SMN_len=="undefined")DyCalendar._SMN_len=3;ar=new Array();for(var i=12;i>0;){ar[--i]=DyCalendar._MN[i].substr(0,DyCalendar._SMN_len)}DyCalendar._SMN=ar}};DyCalendar._C=null;DyCalendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));DyCalendar.is_ie5=(DyCalendar.is_ie&&/msie 5\.0/i.test(navigator.userAgent));DyCalendar.is_opera=/opera/i.test(navigator.userAgent);DyCalendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);DyCalendar.getAbsolutePos=function(el){var SL=0,ST=0;var is_div=/^div$/i.test(el.tagName);if(is_div&&el.scrollLeft)SL=el.scrollLeft;if(is_div&&el.scrollTop)ST=el.scrollTop;var r={x:el.offsetLeft-SL,y:el.offsetTop-ST};if(el.offsetParent){var tmp=this.getAbsolutePos(el.offsetParent);r.x+=tmp.x;r.y+=tmp.y}return r};DyCalendar.isRelated=function(el,evt){var related=evt.relatedTarget;if(!related){var type=evt.type;if(type=="mouseover"){related=evt.fromElement}else if(type=="mouseout"){related=evt.toElement}}while(related){if(related==el){return true}related=related.parentNode}return false};DyCalendar.removeClass=function(el,className){if(!(el&&el.className)){return}var cls=el.className.split(" ");var ar=new Array();for(var i=cls.length;i>0;){if(cls[--i]!=className){ar[ar.length]=cls[i]}}el.className=ar.join(" ")};DyCalendar.addClass=function(el,className){DyCalendar.removeClass(el,className);el.className+=" "+className};DyCalendar.getElement=function(ev){var f=DyCalendar.is_ie?window.event.srcElement:ev.currentTarget;while(f.nodeType!=1||/^div$/i.test(f.tagName))f=f.parentNode;return f};DyCalendar.getTargetElement=function(ev){var f=DyCalendar.is_ie?window.event.srcElement:ev.target;while(f.nodeType!=1)f=f.parentNode;return f};DyCalendar.stopEvent=function(ev){ev||(ev=window.event);if(DyCalendar.is_ie){ev.cancelBubble=true;ev.returnValue=false}else{ev.preventDefault();ev.stopPropagation()}return false};DyCalendar.addEvent=function(el,evname,func){if(el.attachEvent){el.attachEvent("on"+evname,func)}else if(el.addEventListener){el.addEventListener(evname,func,true)}else{el["on"+evname]=func}};DyCalendar.removeEvent=function(el,evname,func){if(el.detachEvent){el.detachEvent("on"+evname,func)}else if(el.removeEventListener){el.removeEventListener(evname,func,true)}else{el["on"+evname]=null}};DyCalendar.createElement=function(type,parent){var el=null;if(document.createElementNS){el=document.createElementNS("http://www.w3.org/1999/xhtml",type)}else{el=document.createElement(type)}if(typeof parent!="undefined"){parent.appendChild(el)}return el};DyCalendar._add_evs=function(el){with(DyCalendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true)}}};DyCalendar.findMonth=function(el){if(typeof el.month!="undefined"){return el}else if(typeof el.parentNode.month!="undefined"){return el.parentNode}return null};DyCalendar.findYear=function(el){if(typeof el.year!="undefined"){return el}else if(typeof el.parentNode.year!="undefined"){return el.parentNode}return null};DyCalendar.showMonthsCombo=function(){var cal=DyCalendar._C;if(!cal){return false}var cal=cal;var cd=cal.activeDiv;var mc=cal.monthsCombo;if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}if(cal.activeMonth){DyCalendar.removeClass(cal.activeMonth,"active")}var mon=cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];DyCalendar.addClass(mon,"active");cal.activeMonth=mon;var s=mc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var mcw=mc.offsetWidth;if(typeof mcw=="undefined")mcw=50;s.left=(cd.offsetLeft+cd.offsetWidth-mcw)+"px"}s.top=(cd.offsetTop+cd.offsetHeight)+"px"};DyCalendar.showYearsCombo=function(fwd){var cal=DyCalendar._C;if(!cal){return false}var cal=cal;var cd=cal.activeDiv;var yc=cal.yearsCombo;if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}if(cal.activeYear){DyCalendar.removeClass(cal.activeYear,"active")}cal.activeYear=null;var Y=cal.date.getFullYear()+(fwd?1:-1);var yr=yc.firstChild;var show=false;for(var i=12;i>0;--i){if(Y>=cal.minYear&&Y<=cal.maxYear){yr.innerHTML=Y;yr.year=Y;yr.style.display="block";show=true}else{yr.style.display="none"}yr=yr.nextSibling;Y+=fwd?cal.yearStep:-cal.yearStep}if(show){var s=yc.style;s.display="block";if(cd.navtype<0)s.left=cd.offsetLeft+"px";else{var ycw=yc.offsetWidth;if(typeof ycw=="undefined")ycw=50;s.left=(cd.offsetLeft+cd.offsetWidth-ycw)+"px"}s.top=(cd.offsetTop+cd.offsetHeight)+"px"}};DyCalendar.tableMouseUp=function(ev){var cal=DyCalendar._C;if(!cal){return false}if(cal.timeout){clearTimeout(cal.timeout)}var el=cal.activeDiv;if(!el){return false}var target=DyCalendar.getTargetElement(ev);ev||(ev=window.event);DyCalendar.removeClass(el,"active");if(target==el||target.parentNode==el){DyCalendar.cellClick(el,ev)}var mon=DyCalendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}else{var year=DyCalendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}}with(DyCalendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev)}};DyCalendar.tableMouseOver=function(ev){var cal=DyCalendar._C;if(!cal){return}var el=cal.activeDiv;var target=DyCalendar.getTargetElement(ev);if(target==el||target.parentNode==el){DyCalendar.addClass(el,"hilite active");DyCalendar.addClass(el.parentNode,"rowhilite")}else{if(typeof el.navtype=="undefined"||(el.navtype!=50&&(el.navtype==0||Math.abs(el.navtype)>2)))DyCalendar.removeClass(el,"active");DyCalendar.removeClass(el,"hilite");DyCalendar.removeClass(el.parentNode,"rowhilite")}ev||(ev=window.event);if(el.navtype==50&&target!=el){var pos=DyCalendar.getAbsolutePos(el);var w=el.offsetWidth;var x=ev.clientX;var dx;var decrease=true;if(x>pos.x+w){dx=x-pos.x-w;decrease=false}else dx=pos.x-x;if(dx<0)dx=0;var range=el._range;var current=el._current;var count=Math.floor(dx/10)%range.length;for(var i=range.length;--i>=0;)if(range[i]==current)break;while(count-->0)if(decrease){if(--i<0)i=range.length-1}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime()}var mon=DyCalendar.findMonth(target);if(mon){if(mon.month!=cal.date.getMonth()){if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}DyCalendar.addClass(mon,"hilite");cal.hilitedMonth=mon}else if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}}else{if(cal.hilitedMonth){DyCalendar.removeClass(cal.hilitedMonth,"hilite")}var year=DyCalendar.findYear(target);if(year){if(year.year!=cal.date.getFullYear()){if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}DyCalendar.addClass(year,"hilite");cal.hilitedYear=year}else if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}}else if(cal.hilitedYear){DyCalendar.removeClass(cal.hilitedYear,"hilite")}}return DyCalendar.stopEvent(ev)};DyCalendar.tableMouseDown=function(ev){if(DyCalendar.getTargetElement(ev)==DyCalendar.getElement(ev)){return DyCalendar.stopEvent(ev)}};DyCalendar.calDragIt=function(ev){var cal=DyCalendar._C;if(!(cal&&cal.dragging)){return false}var posX;var posY;if(DyCalendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft}else{posX=ev.pageX;posY=ev.pageY}cal.hideShowCovered();var st=cal.element.style;st.left=(posX-cal.xOffs)+"px";st.top=(posY-cal.yOffs)+"px";return DyCalendar.stopEvent(ev)};DyCalendar.calDragEnd=function(ev){var cal=DyCalendar._C;if(!cal){return false}cal.dragging=false;with(DyCalendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev)}cal.hideShowCovered()};DyCalendar.dayMouseDown=function(ev){var el=DyCalendar.getElement(ev);if(el.disabled){return false}var cal=el.calendar;cal.activeDiv=el;DyCalendar._C=cal;if(el.navtype!=300)with(DyCalendar){if(el.navtype==50){el._current=el.innerHTML;addEvent(document,"mousemove",tableMouseOver)}else addEvent(document,DyCalendar.is_ie5?"mousemove":"mouseover",tableMouseOver);addClass(el,"hilite active");addEvent(document,"mouseup",tableMouseUp)}else if(cal.isPopup){cal._dragStart(ev)}if(el.navtype==-1||el.navtype==1){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout("DyCalendar.showMonthsCombo()",250)}else if(el.navtype==-2||el.navtype==2){if(cal.timeout)clearTimeout(cal.timeout);cal.timeout=setTimeout((el.navtype>0)?"DyCalendar.showYearsCombo(true)":"DyCalendar.showYearsCombo(false)",250)}else{cal.timeout=null}return DyCalendar.stopEvent(ev)};DyCalendar.dayMouseDblClick=function(ev){DyCalendar.cellClick(DyCalendar.getElement(ev),ev||window.event);if(DyCalendar.is_ie){document.selection.empty()}};DyCalendar.dayMouseOver=function(ev){var el=DyCalendar.getElement(ev);if(DyCalendar.isRelated(el,ev)||DyCalendar._C||el.disabled){return false}if(el.ttip){if(el.ttip.substr(0,1)=="_"){el.ttip=el.caldate.print(el.calendar.ttDateFormat)+el.ttip.substr(1)}el.calendar.tooltips.innerHTML=el.ttip}if(el.navtype!=300){DyCalendar.addClass(el,"hilite");if(el.caldate){DyCalendar.addClass(el.parentNode,"rowhilite")}}return DyCalendar.stopEvent(ev)};DyCalendar.dayMouseOut=function(ev){with(DyCalendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled)return false;removeClass(el,"hilite");if(el.caldate)removeClass(el.parentNode,"rowhilite");if(el.calendar)el.calendar.tooltips.innerHTML=_TT["SEL_DATE"];return stopEvent(ev)}};DyCalendar.cellClick=function(el,ev){var cal=el.calendar;var closing=false;var newdate=false;var date=null;if(typeof el.navtype=="undefined"){if(cal.currentDateEl){DyCalendar.removeClass(cal.currentDateEl,"selected");DyCalendar.addClass(el,"selected");closing=(cal.currentDateEl==el);if(!closing){cal.currentDateEl=el}}cal.date.setDateOnly(el.caldate);date=cal.date;var other_month=!(cal.dateClicked=!el.otherMonth);if(!other_month&&!cal.currentDateEl)cal._toggleMultipleDate(new Date(date));else newdate=!el.disabled;if(other_month)cal._init(cal.firstDayOfWeek,date)}else{if(el.navtype==200){DyCalendar.removeClass(el,"hilite");cal.callCloseHandler();return}date=new Date(cal.date);if(el.navtype==0)date.setDateOnly(new Date());cal.dateClicked=false;var year=date.getFullYear();var mon=date.getMonth();function setMonth(m){var day=date.getDate();var max=date.getMonthDays(m);if(day>max){date.setDate(max)}date.setMonth(m)};switch(el.navtype){case 400:DyCalendar.removeClass(el,"hilite");var text=DyCalendar._TT["ABOUT"];if(typeof text!="undefined"){text+=cal.showsTime?DyCalendar._TT["ABOUT_TIME"]:""}else{text="Help and about box text is not translated into this language.\n"+"If you know this language and you feel generous please update\n"+"the corresponding file in \"lang\" subdir to match calendar-en.js\n"+"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n"+"Thank you!\n"+"http://dynarch.com/mishoo/calendar.epl\n"}alert(text);return;case-2:if(year>cal.minYear){date.setFullYear(year-1)}break;case-1:if(mon>0){setMonth(mon-1)}else if(year-->cal.minYear){date.setFullYear(year);setMonth(11)}break;case 1:if(mon<11){setMonth(mon+1)}else if(year<cal.maxYear){date.setFullYear(year+1);setMonth(0)}break;case 2:if(year<cal.maxYear){date.setFullYear(year+1)}break;case 100:cal.setFirstDayOfWeek(el.fdow);return;case 50:var range=el._range;var current=el.innerHTML;for(var i=range.length;--i>=0;)if(range[i]==current)break;if(ev&&ev.shiftKey){if(--i<0)i=range.length-1}else if(++i>=range.length)i=0;var newval=range[i];el.innerHTML=newval;cal.onUpdateTime();return;case 0:if((typeof cal.getDateStatus=="function")&&cal.getDateStatus(date,date.getFullYear(),date.getMonth(),date.getDate())){return false}break}if(!date.equalsTo(cal.date)){cal.setDate(date);newdate=true}else if(el.navtype==0)newdate=closing=true}if(newdate){ev&&cal.callHandler()}if(closing){DyCalendar.removeClass(el,"hilite");ev&&cal.callCloseHandler()}};DyCalendar.prototype.create=function(_par){var parent=null;if(!_par){parent=document.getElementsByTagName("body")[0];this.isPopup=true}else{parent=_par;this.isPopup=false}this.date=this.dateStr?new Date(this.dateStr):new Date();var table=DyCalendar.createElement("table");this.table=table;table.cellSpacing=0;table.cellPadding=0;table.calendar=this;DyCalendar.addEvent(table,"mousedown",DyCalendar.tableMouseDown);var div=DyCalendar.createElement("div");this.element=div;div.className="calendar";if(this.isPopup){div.style.position="absolute";div.style.display="none"}div.appendChild(table);var thead=DyCalendar.createElement("thead",table);var cell=null;var row=null;var cal=this;var hh=function(text,cs,navtype){cell=DyCalendar.createElement("td",row);cell.colSpan=cs;cell.className="button";if(navtype!=0&&Math.abs(navtype)<=2)cell.className+=" nav";DyCalendar._add_evs(cell);cell.calendar=cal;cell.navtype=navtype;cell.innerHTML="<div unselectable='on'>"+text+"</div>";return cell};row=DyCalendar.createElement("tr",thead);var title_length=6;(this.isPopup)&&--title_length;(this.weekNumbers)&&++title_length;hh("?",1,400).ttip=DyCalendar._TT["INFO"];this.title=hh("",title_length,300);this.title.className="title";if(this.isPopup){this.title.ttip=DyCalendar._TT["DRAG_TO_MOVE"];this.title.style.cursor="move";hh("&#x00d7;",1,200).ttip=DyCalendar._TT["CLOSE"]}row=DyCalendar.createElement("tr",thead);row.className="headrow";this._nav_py=hh("&#x00ab;",1,-2);this._nav_py.ttip=DyCalendar._TT["PREV_YEAR"];this._nav_pm=hh("&#x2039;",1,-1);this._nav_pm.ttip=DyCalendar._TT["PREV_MONTH"];this._nav_now=hh(DyCalendar._TT["TODAY"],this.weekNumbers?4:3,0);this._nav_now.ttip=DyCalendar._TT["GO_TODAY"];this._nav_nm=hh("&#x203a;",1,1);this._nav_nm.ttip=DyCalendar._TT["NEXT_MONTH"];this._nav_ny=hh("&#x00bb;",1,2);this._nav_ny.ttip=DyCalendar._TT["NEXT_YEAR"];row=DyCalendar.createElement("tr",thead);row.className="daynames";if(this.weekNumbers){cell=DyCalendar.createElement("td",row);cell.className="name wn";cell.innerHTML=DyCalendar._TT["WK"]}for(var i=7;i>0;--i){cell=DyCalendar.createElement("td",row);if(!i){cell.navtype=100;cell.calendar=this;DyCalendar._add_evs(cell)}}this.firstdayname=(this.weekNumbers)?row.firstChild.nextSibling:row.firstChild;this._displayWeekdays();var tbody=DyCalendar.createElement("tbody",table);this.tbody=tbody;for(i=6;i>0;--i){row=DyCalendar.createElement("tr",tbody);if(this.weekNumbers){cell=DyCalendar.createElement("td",row)}for(var j=7;j>0;--j){cell=DyCalendar.createElement("td",row);cell.calendar=this;DyCalendar._add_evs(cell)}}if(this.showsTime){row=DyCalendar.createElement("tr",tbody);row.className="time";cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=2;cell.innerHTML=DyCalendar._TT["TIME"]||"&nbsp;";cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=this.weekNumbers?4:3;(function(){function makeTimePart(className,init,range_start,range_end){var part=DyCalendar.createElement("span",cell);part.className=className;part.innerHTML=init;part.calendar=cal;part.ttip=DyCalendar._TT["TIME_PART"];part.navtype=50;part._range=[];if(typeof range_start!="number")part._range=range_start;else{for(var i=range_start;i<=range_end;++i){var txt;if(i<10&&range_end>=10)txt='0'+i;else txt=''+i;part._range[part._range.length]=txt}}DyCalendar._add_evs(part);return part};var hrs=cal.date.getHours();var mins=cal.date.getMinutes();var t12=!cal.time24;var pm=(hrs>12);if(t12&&pm)hrs-=12;var H=makeTimePart("hour",hrs,t12?1:0,t12?12:23);var span=DyCalendar.createElement("span",cell);span.innerHTML=":";span.className="colon";var M=makeTimePart("minute",mins,0,59);var AP=null;cell=DyCalendar.createElement("td",row);cell.className="time";cell.colSpan=2;if(t12)AP=makeTimePart("ampm",pm?"pm":"am",["am","pm"]);else cell.innerHTML="&nbsp;";cal.onSetTime=function(){var pm,hrs=this.date.getHours(),mins=this.date.getMinutes();if(t12){pm=(hrs>=12);if(pm)hrs-=12;if(hrs==0)hrs=12;AP.innerHTML=pm?"pm":"am"}H.innerHTML=(hrs<10)?("0"+hrs):hrs;M.innerHTML=(mins<10)?("0"+mins):mins};cal.onUpdateTime=function(){var date=this.date;var h=parseInt(H.innerHTML,10);if(t12){if(/pm/i.test(AP.innerHTML)&&h<12)h+=12;else if(/am/i.test(AP.innerHTML)&&h==12)h=0}var d=date.getDate();var m=date.getMonth();var y=date.getFullYear();date.setHours(h);date.setMinutes(parseInt(M.innerHTML,10));date.setFullYear(y);date.setMonth(m);date.setDate(d);this.dateClicked=false;this.callHandler()}})()}else{this.onSetTime=this.onUpdateTime=function(){}}var tfoot=DyCalendar.createElement("tfoot",table);row=DyCalendar.createElement("tr",tfoot);row.className="footrow";cell=hh(DyCalendar._TT["SEL_DATE"],this.weekNumbers?8:7,300);cell.className="ttip";if(this.isPopup){cell.ttip=DyCalendar._TT["DRAG_TO_MOVE"];cell.style.cursor="move"}this.tooltips=cell;div=DyCalendar.createElement("div",this.element);this.monthsCombo=div;div.className="combo";for(i=0;i<DyCalendar._MN.length;++i){var mn=DyCalendar.createElement("div");mn.className=DyCalendar.is_ie?"label-IEfix":"label";mn.month=i;mn.innerHTML=DyCalendar._SMN[i];div.appendChild(mn)}div=DyCalendar.createElement("div",this.element);this.yearsCombo=div;div.className="combo";for(i=12;i>0;--i){var yr=DyCalendar.createElement("div");yr.className=DyCalendar.is_ie?"label-IEfix":"label";div.appendChild(yr)}this._init(this.firstDayOfWeek,this.date);parent.appendChild(this.element)};DyCalendar._keyEvent=function(ev){var cal=window._dynarch_popupDyCalendar;if(!cal||cal.multiple)return false;(DyCalendar.is_ie)&&(ev=window.event);var act=(DyCalendar.is_ie||ev.type=="keypress"),K=ev.keyCode;if(ev.ctrlKey){switch(K){case 37:act&&DyCalendar.cellClick(cal._nav_pm);break;case 38:act&&DyCalendar.cellClick(cal._nav_py);break;case 39:act&&DyCalendar.cellClick(cal._nav_nm);break;case 40:act&&DyCalendar.cellClick(cal._nav_ny);break;default:return false}}else switch(K){case 32:DyCalendar.cellClick(cal._nav_now);break;case 27:act&&cal.callCloseHandler();break;case 37:case 38:case 39:case 40:if(act){var prev,x,y,ne,el,step;prev=K==37||K==38;step=(K==37||K==39)?1:7;function setVars(){el=cal.currentDateEl;var p=el.pos;x=p&15;y=p>>4;ne=cal.ar_days[y][x]};setVars();function prevMonth(){var date=new Date(cal.date);date.setDate(date.getDate()-step);cal.setDate(date)};function nextMonth(){var date=new Date(cal.date);date.setDate(date.getDate()+step);cal.setDate(date)};while(1){switch(K){case 37:if(--x>=0)ne=cal.ar_days[y][x];else{x=6;K=38;continue}break;case 38:if(--y>=0)ne=cal.ar_days[y][x];else{prevMonth();setVars()}break;case 39:if(++x<7)ne=cal.ar_days[y][x];else{x=0;K=40;continue}break;case 40:if(++y<cal.ar_days.length)ne=cal.ar_days[y][x];else{nextMonth();setVars()}break}break}if(ne){if(!ne.disabled)DyCalendar.cellClick(ne);else if(prev)prevMonth();else nextMonth()}}break;case 13:if(act)DyCalendar.cellClick(cal.currentDateEl,ev);break;default:return false}return DyCalendar.stopEvent(ev)};DyCalendar.prototype._init=function(firstDayOfWeek,date){var today=new Date(),TY=today.getFullYear(),TM=today.getMonth(),TD=today.getDate();this.table.style.visibility="hidden";var year=date.getFullYear();if(year<this.minYear){year=this.minYear;date.setFullYear(year)}else if(year>this.maxYear){year=this.maxYear;date.setFullYear(year)}this.firstDayOfWeek=firstDayOfWeek;this.date=new Date(date);var month=date.getMonth();var mday=date.getDate();var no_days=date.getMonthDays();date.setDate(1);var day1=(date.getDay()-this.firstDayOfWeek)%7;if(day1<0)day1+=7;date.setDate(-day1);date.setDate(date.getDate()+1);var row=this.tbody.firstChild;var MN=DyCalendar._SMN[month];var ar_days=this.ar_days=new Array();var weekend=DyCalendar._TT["WEEKEND"];var dates=this.multiple?(this.datesCells={}):null;for(var i=0;i<6;++i,row=row.nextSibling){var cell=row.firstChild;if(this.weekNumbers){cell.className="day wn";cell.innerHTML=date.getWeekNumber();cell=cell.nextSibling}row.className="daysrow";var hasdays=false,iday,dpos=ar_days[i]=[];for(var j=0;j<7;++j,cell=cell.nextSibling,date.setDate(iday+1)){iday=date.getDate();var wday=date.getDay();cell.className="day";cell.pos=i<<4|j;dpos[j]=cell;var current_month=(date.getMonth()==month);if(!current_month){if(this.showsOtherMonths){cell.className+=" othermonth";cell.otherMonth=true}else{cell.className="emptycell";cell.innerHTML="&nbsp;";cell.disabled=true;continue}}else{cell.otherMonth=false;hasdays=true}cell.disabled=false;cell.innerHTML=this.getDateText?this.getDateText(date,iday):iday;if(dates)dates[date.print("%Y%m%d")]=cell;if(this.getDateStatus){var status=this.getDateStatus(date,year,month,iday);if(this.getDateToolTip){var toolTip=this.getDateToolTip(date,year,month,iday);if(toolTip)cell.title=toolTip}if(status===true){cell.className+=" disabled";cell.disabled=true}else{if(/disabled/i.test(status))cell.disabled=true;cell.className+=" "+status}}if(!cell.disabled){cell.caldate=new Date(date);cell.ttip="_";if(!this.multiple&&current_month&&iday==mday&&this.hiliteToday){cell.className+=" selected";this.currentDateEl=cell}if(date.getFullYear()==TY&&date.getMonth()==TM&&iday==TD){cell.className+=" today";cell.ttip+=DyCalendar._TT["PART_TODAY"]}if(weekend.indexOf(wday.toString())!=-1)cell.className+=cell.otherMonth?" oweekend":" weekend"}}if(!(hasdays||this.showsOtherMonths))row.className="emptyrow"}this.title.innerHTML=DyCalendar._MN[month]+", "+year;this.onSetTime();this.table.style.visibility="visible";this._initMultipleDates()};DyCalendar.prototype._initMultipleDates=function(){if(this.multiple){for(var i in this.multiple){var cell=this.datesCells[i];var d=this.multiple[i];if(!d)continue;if(cell)cell.className+=" selected"}}};DyCalendar.prototype._toggleMultipleDate=function(date){if(this.multiple){var ds=date.print("%Y%m%d");var cell=this.datesCells[ds];if(cell){var d=this.multiple[ds];if(!d){DyCalendar.addClass(cell,"selected");this.multiple[ds]=date}else{DyCalendar.removeClass(cell,"selected");delete this.multiple[ds]}}}};DyCalendar.prototype.setDateToolTipHandler=function(unaryFunction){this.getDateToolTip=unaryFunction};DyCalendar.prototype.setDate=function(date){if(!date.equalsTo(this.date)){this._init(this.firstDayOfWeek,date)}};DyCalendar.prototype.refresh=function(){this._init(this.firstDayOfWeek,this.date)};DyCalendar.prototype.setFirstDayOfWeek=function(firstDayOfWeek){this._init(firstDayOfWeek,this.date);this._displayWeekdays()};DyCalendar.prototype.setDateStatusHandler=DyCalendar.prototype.setDisabledHandler=function(unaryFunction){this.getDateStatus=unaryFunction};DyCalendar.prototype.setRange=function(a,z){this.minYear=a;this.maxYear=z};DyCalendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat))}};DyCalendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this)}this.hideShowCovered()};DyCalendar.prototype.destroy=function(){var el=this.element.parentNode;el.removeChild(this.element);DyCalendar._C=null;window._dynarch_popupDyCalendar=null};DyCalendar.prototype.reparent=function(new_parent){var el=this.element;el.parentNode.removeChild(el);new_parent.appendChild(el)};DyCalendar._checkDyCalendar=function(ev){var calendar=window._dynarch_popupDyCalendar;if(!calendar){return false}var el=DyCalendar.is_ie?DyCalendar.getElement(ev):DyCalendar.getTargetElement(ev);for(;el!=null&&el!=calendar.element;el=el.parentNode);if(el==null){window._dynarch_popupDyCalendar.callCloseHandler();return DyCalendar.stopEvent(ev)}};DyCalendar.prototype.show=function(){var rows=this.table.getElementsByTagName("tr");for(var i=rows.length;i>0;){var row=rows[--i];DyCalendar.removeClass(row,"rowhilite");var cells=row.getElementsByTagName("td");for(var j=cells.length;j>0;){var cell=cells[--j];DyCalendar.removeClass(cell,"hilite");DyCalendar.removeClass(cell,"active")}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window._dynarch_popupDyCalendar=this;DyCalendar.addEvent(document,"keydown",DyCalendar._keyEvent);DyCalendar.addEvent(document,"keypress",DyCalendar._keyEvent);DyCalendar.addEvent(document,"mousedown",DyCalendar._checkDyCalendar)}this.hideShowCovered()};DyCalendar.prototype.hide=function(){if(this.isPopup){DyCalendar.removeEvent(document,"keydown",DyCalendar._keyEvent);DyCalendar.removeEvent(document,"keypress",DyCalendar._keyEvent);DyCalendar.removeEvent(document,"mousedown",DyCalendar._checkDyCalendar)}this.element.style.display="none";this.hidden=true;this.hideShowCovered()};DyCalendar.prototype.showAt=function(x,y){var s=this.element.style;s.left=x+"px";s.top=y+"px";this.show()};DyCalendar.prototype.showAtElement=function(el,opts){var self=this;var p=DyCalendar.getAbsolutePos(el);if(!opts||typeof opts!="string"){this.showAt(p.x,p.y+el.offsetHeight);return true}function fixPosition(box){if(box.x<0)box.x=0;if(box.y<0)box.y=0;var cp=document.createElement("div");var s=cp.style;s.position="absolute";s.right=s.bottom=s.width=s.height="0px";document.body.appendChild(cp);var br=DyCalendar.getAbsolutePos(cp);document.body.removeChild(cp);if(DyCalendar.is_ie){br.y+=document.body.scrollTop;br.x+=document.body.scrollLeft}else{br.y+=window.scrollY;br.x+=window.scrollX}var tmp=box.x+box.width-br.x;if(tmp>0)box.x-=tmp;tmp=box.y+box.height-br.y;if(tmp>0)box.y-=tmp};this.element.style.display="block";DyCalendar.continuation_for_the_fucking_khtml_browser=function(){var w=self.element.offsetWidth;var h=self.element.offsetHeight;self.element.style.display="none";var valign=opts.substr(0,1);var halign="l";if(opts.length>1){halign=opts.substr(1,1)}switch(valign){case"T":p.y-=h;break;case"B":p.y+=el.offsetHeight;break;case"C":p.y+=(el.offsetHeight-h)/2;break;case"t":p.y+=el.offsetHeight-h;break;case"b":break}switch(halign){case"L":p.x-=w;break;case"R":p.x+=el.offsetWidth;break;case"C":p.x+=(el.offsetWidth-w)/2;break;case"l":p.x+=el.offsetWidth-w;break;case"r":break}p.width=w;p.height=h+40;self.monthsCombo.style.display="none";fixPosition(p);self.showAt(p.x,p.y)};if(DyCalendar.is_khtml)setTimeout("DyCalendar.continuation_for_the_fucking_khtml_browser()",10);else DyCalendar.continuation_for_the_fucking_khtml_browser()};DyCalendar.prototype.setDateFormat=function(str){this.dateFormat=str};DyCalendar.prototype.setTtDateFormat=function(str){this.ttDateFormat=str};DyCalendar.prototype.parseDate=function(str,fmt){if(!fmt)fmt=this.dateFormat;this.setDate(Date.parseDate(str,fmt))};DyCalendar.prototype.hideShowCovered=function(){if(!DyCalendar.is_ie&&!DyCalendar.is_opera)return;function getVisib(obj){var value=obj.style.visibility;if(!value){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){if(!DyCalendar.is_khtml)value=document.defaultView.getComputedStyle(obj,"").getPropertyValue("visibility");else value=''}else if(obj.currentStyle){value=obj.currentStyle.visibility}else value=''}return value};var tags=new Array("applet","iframe","select");var el=this.element;var p=DyCalendar.getAbsolutePos(el);var EX1=p.x;var EX2=el.offsetWidth+EX1;var EY1=p.y;var EY2=el.offsetHeight+EY1;for(var k=tags.length;k>0;){var ar=document.getElementsByTagName(tags[--k]);var cc=null;for(var i=ar.length;i>0;){cc=ar[--i];p=DyCalendar.getAbsolutePos(cc);var CX1=p.x;var CX2=cc.offsetWidth+CX1;var CY1=p.y;var CY2=cc.offsetHeight+CY1;if(this.hidden||(CX1>EX2)||(CX2<EX1)||(CY1>EY2)||(CY2<EY1)){if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc)}cc.style.visibility=cc.__msh_save_visibility}else{if(!cc.__msh_save_visibility){cc.__msh_save_visibility=getVisib(cc)}cc.style.visibility="hidden"}}}};DyCalendar.prototype._displayWeekdays=function(){var fdow=this.firstDayOfWeek;var cell=this.firstdayname;var weekend=DyCalendar._TT["WEEKEND"];for(var i=0;i<7;++i){cell.className="day name";var realday=(i+fdow)%7;if(i){cell.ttip=DyCalendar._TT["DAY_FIRST"].replace("%s",DyCalendar._DN[realday]);cell.navtype=100;cell.calendar=this;cell.fdow=realday;DyCalendar._add_evs(cell)}if(weekend.indexOf(realday.toString())!=-1){DyCalendar.addClass(cell,"weekend")}cell.innerHTML=DyCalendar._SDN[(i+fdow)%7];cell=cell.nextSibling}};DyCalendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none"};DyCalendar.prototype._dragStart=function(ev){if(this.dragging){return}this.dragging=true;var posX;var posY;if(DyCalendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(DyCalendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseup",calDragEnd)}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.parseDate=function(str,fmt){var today=new Date();var y=0;var m=-1;var d=0;var a=str.split(/\W+/);var b=fmt.match(/%./g);var i=0,j=0;var hr=0;var min=0;for(i=0;i<a.length;++i){if(!a[i])continue;switch(b[i]){case"%d":case"%e":d=parseInt(a[i],10);break;case"%m":m=parseInt(a[i],10)-1;break;case"%Y":case"%y":y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000);break;case"%b":case"%B":for(j=0;j<12;++j){if(DyCalendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){m=j;break}}break;case"%H":case"%I":case"%k":case"%l":hr=parseInt(a[i],10);break;case"%P":case"%p":if(/pm/i.test(a[i])&&hr<12)hr+=12;else if(/am/i.test(a[i])&&hr>=12)hr-=12;break;case"%M":min=parseInt(a[i],10);break}}if(isNaN(y))y=today.getFullYear();if(isNaN(m))m=today.getMonth();if(isNaN(d))d=today.getDate();if(isNaN(hr))hr=today.getHours();if(isNaN(min))min=today.getMinutes();if(y!=0&&m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);y=0;m=-1;d=0;for(i=0;i<a.length;++i){if(a[i].search(/[a-zA-Z]+/)!=-1){var t=-1;for(j=0;j<12;++j){if(DyCalendar._MN[j].substr(0,a[i].length).toLowerCase()==a[i].toLowerCase()){t=j;break}}if(t!=-1){if(m!=-1){d=m+1}m=t}}else if(parseInt(a[i],10)<=12&&m==-1){m=a[i]-1}else if(parseInt(a[i],10)>31&&y==0){y=parseInt(a[i],10);(y<100)&&(y+=(y>29)?1900:2000)}else if(d==0){d=a[i]}}if(y==0)y=today.getFullYear();if(m!=-1&&d!=0)return new Date(y,m,d,hr,min,0);return today};Date.prototype.getMonthDays=function(month){var year=this.getFullYear();if(typeof month=="undefined"){month=this.getMonth()}if(((0==(year%4))&&((0!=(year%100))||(0==(year%400))))&&month==1){return 29}else{return Date._MD[month]}};Date.prototype.getDayOfYear=function(){var now=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var then=new Date(this.getFullYear(),0,0,0,0,0);var time=now-then;return Math.floor(time/Date.DAY)};Date.prototype.getWeekNumber=function(){var d=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var DoW=d.getDay();d.setDate(d.getDate()-(DoW+6)%7+3);var ms=d.valueOf();d.setMonth(0);d.setDate(4);return Math.round((ms-d.valueOf())/(7*864e5))+1};Date.prototype.equalsTo=function(date){return((this.getFullYear()==date.getFullYear())&&(this.getMonth()==date.getMonth())&&(this.getDate()==date.getDate())&&(this.getHours()==date.getHours())&&(this.getMinutes()==date.getMinutes()))};Date.prototype.setDateOnly=function(date){var tmp=new Date(date);this.setDate(1);this.setFullYear(tmp.getFullYear());this.setMonth(tmp.getMonth());this.setDate(tmp.getDate())};Date.prototype.print=function(str){var m=this.getMonth();var d=this.getDate();var y=this.getFullYear();var wn=this.getWeekNumber();var w=this.getDay();var s={};var hr=this.getHours();var pm=(hr>=12);var ir=(pm)?(hr-12):hr;var dy=this.getDayOfYear();if(ir==0)ir=12;var min=this.getMinutes();var sec=this.getSeconds();s["%a"]=DyCalendar._SDN[w];s["%A"]=DyCalendar._DN[w];s["%b"]=DyCalendar._SMN[m];s["%B"]=DyCalendar._MN[m];s["%C"]=1+Math.floor(y/100);s["%d"]=(d<10)?("0"+d):d;s["%e"]=d;s["%H"]=(hr<10)?("0"+hr):hr;s["%I"]=(ir<10)?("0"+ir):ir;s["%j"]=(dy<100)?((dy<10)?("00"+dy):("0"+dy)):dy;s["%k"]=hr;s["%l"]=ir;s["%m"]=(m<9)?("0"+(1+m)):(1+m);s["%M"]=(min<10)?("0"+min):min;s["%n"]="\n";s["%p"]=pm?"PM":"AM";s["%P"]=pm?"pm":"am";s["%s"]=Math.floor(this.getTime()/1000);s["%S"]=(sec<10)?("0"+sec):sec;s["%t"]="\t";s["%U"]=s["%W"]=s["%V"]=(wn<10)?("0"+wn):wn;s["%u"]=w+1;s["%w"]=w;s["%y"]=(''+y).substr(2,2);s["%Y"]=y;s["%%"]="%";var re=/%./g;if(!DyCalendar.is_ie5&&!DyCalendar.is_khtml)return str.replace(re,function(par){return s[par]||par});var a=str.match(re);for(var i=0;i<a.length;i++){var tmp=s[a[i]];if(tmp){re=new RegExp(a[i],'g');str=str.replace(re,tmp)}}return str};Date.prototype.__msh_oldSetFullYear=Date.prototype.setFullYear;Date.prototype.setFullYear=function(y){var d=new Date(this);d.__msh_oldSetFullYear(y);if(d.getMonth()!=this.getMonth())this.setDate(28);this.__msh_oldSetFullYear(y)};window._dynarch_popupDyCalendar=null;
\ No newline at end of file
diff --git a/modules/board/skins/xe_board/extra_var_form.html b/modules/board/skins/xe_board/extra_var_form.html
index 301907639..80620b6c6 100644
--- a/modules/board/skins/xe_board/extra_var_form.html
+++ b/modules/board/skins/xe_board/extra_var_form.html
@@ -1,7 +1,7 @@
 <!-- 이 파일은 extra_vars의 form을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
 
 <!-- calendar -->
-<!--%import("../../../../common/js/calendar.js",optimized=false)-->
+<!--%import("../../../../common/js/calendar.min.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
diff --git a/modules/board/skins/xe_guestbook/extra_var_form.html b/modules/board/skins/xe_guestbook/extra_var_form.html
index c796d1d9c..6ce56dc09 100644
--- a/modules/board/skins/xe_guestbook/extra_var_form.html
+++ b/modules/board/skins/xe_guestbook/extra_var_form.html
@@ -1,7 +1,7 @@
 <!-- 이 파일은 extra_vars의 form을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
 
 <!-- calendar -->
-<!--%import("../../../../common/js/calendar.js",optimized=false)-->
+<!--%import("../../../../common/js/calendar.min.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html
index 04b40b405..53cc03713 100644
--- a/modules/counter/tpl/index.html
+++ b/modules/counter/tpl/index.html
@@ -1,7 +1,7 @@
 <!--%import("js/counter_admin.js")-->
 
 <!-- calendar -->
-<!--%import("../../common/js/calendar.js",optimized=false)-->
+<!--%import("../../common/js/calendar.min.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 92b952f2f..bad06d72c 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -4,7 +4,7 @@
 <!--%import("../lang")-->
 
 <!-- calendar -->
-<!--%import("../../../../../common/js/calendar.js",optimized=false)-->
+<!--%import("../../../../../common/js/calendar.min.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 31cbcefc7..18aa61e78 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -17,7 +17,7 @@
 <!--@end-->
 
 <!-- calendar -->
-<!--%import("../../../../common/js/calendar.js",optimized=false)-->
+<!--%import("../../../../common/js/calendar.min.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 80fa48570..6fe437841 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -3,7 +3,7 @@
 <!--%import("filter/signup.xml")-->
 
 <!-- calendar -->
-<!--%import("../../../../common/js/calendar.js",optimized=false)-->
+<!--%import("../../../../common/js/calendar.min.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index 1cf462a47..44188d4e3 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -3,7 +3,7 @@
 <!--%import("css/member_admin.css")-->
 
 <!-- calendar -->
-<!--%import("../../common/js/calendar.js",optimized=false)-->
+<!--%import("../../common/js/calendar.min.js",optimized=false)-->
 <!--@if($lang_type == 'ko')-->
     <!--%import("../../common/js/calendar-ko.js",optimized=false)-->
 <!--@elseif($lang_type == 'es')-->

From 296c181762081ff4b760c76306bb746a8d25e844 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 14 May 2008 04:35:18 +0000
Subject: [PATCH 096/111] =?UTF-8?q?#410.=20trigger=EB=A1=9C=20=EC=B6=94?=
 =?UTF-8?q?=EC=B2=9C,=20=EB=B9=84=EC=B6=94=EC=B2=9C=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=B3=80=EB=8F=99=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=A7=80=EC=9B=90?=
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@4194 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.controller.php   |  8 +++++
 modules/point/lang/en.lang.php             |  2 ++
 modules/point/lang/es.lang.php             |  2 ++
 modules/point/lang/jp.lang.php             |  2 ++
 modules/point/lang/ko.lang.php             |  3 +-
 modules/point/lang/ru.lang.php             |  2 ++
 modules/point/lang/zh-CN.lang.php          |  2 ++
 modules/point/point.admin.controller.php   |  6 +++-
 modules/point/point.class.php              | 14 +++++++++
 modules/point/point.controller.php         | 35 ++++++++++++++++++++++
 modules/point/point.view.php               |  4 +++
 modules/point/tpl/config.html              | 10 ++++++-
 modules/point/tpl/module_config.html       |  6 +++-
 modules/point/tpl/point_module_config.html |  8 +++++
 14 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index ff5cedfd2..cb58526d2 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -415,14 +415,22 @@
                 $args->voted_count = $oDocument->get('voted_count') + $point;
                 $output = executeQuery('document.updateVotedCount', $args);
             }
+            if(!$output->toBool()) return $output;
 
             // 로그 남기기
             $args->point = $point;
             $output = executeQuery('document.insertDocumentVotedLog', $args);
+            if(!$output->toBool()) return $output;
 
             // 세션 정보에 남김
             $_SESSION['voted_document'][$document_srl] = true;
 
+	    $obj->member_srl = $oDocument->get('member_srl');
+	    $obj->module_srl = $oDocument->get('module_srl');
+	    $obj->point = $point;
+            $output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $obj);
+            if(!$output->toBool()) return $output;
+
             // 결과 리턴
             if($point > 0)
                 return new Object(0, 'success_voted');
diff --git a/modules/point/lang/en.lang.php b/modules/point/lang/en.lang.php
index 3bfea5867..67f988279 100644
--- a/modules/point/lang/en.lang.php
+++ b/modules/point/lang/en.lang.php
@@ -48,6 +48,8 @@
     $lang->point_delete_file = 'On Deleting Files';
     $lang->point_download_file = 'On Downloading Files (Exclude images)';
     $lang->point_read_document = 'On Reading';
+    $lang->point_voted = 'On Recommended';
+    $lang->point_blamed = 'On Blamed';
 
 
     $lang->cmd_point_config = 'Default Setting';
diff --git a/modules/point/lang/es.lang.php b/modules/point/lang/es.lang.php
index f0b9c7978..3eb4aadf9 100644
--- a/modules/point/lang/es.lang.php
+++ b/modules/point/lang/es.lang.php
@@ -48,6 +48,8 @@
     $lang->point_delete_file = 'Al borrar archivos';
     $lang->point_download_file = 'Al descargar archivos (Excepto imágenes)';
     $lang->point_read_document = 'El Reading';
+    $lang->point_voted = '추천 받음';
+    $lang->point_blamed = '비추천 받음';
 
 
     $lang->cmd_point_config = 'Configuración predefinida';
diff --git a/modules/point/lang/jp.lang.php b/modules/point/lang/jp.lang.php
index b16ba2c92..041db5e44 100644
--- a/modules/point/lang/jp.lang.php
+++ b/modules/point/lang/jp.lang.php
@@ -48,6 +48,8 @@
     $lang->point_delete_file = 'ファイル削除';
     $lang->point_download_file = 'ダウンロード';
     $lang->point_read_document = '書き込み照会';
+    $lang->point_voted = '추천 받음';
+    $lang->point_blamed = '비추천 받음';
 
 
     $lang->cmd_point_config = 'デフォルト設定';
diff --git a/modules/point/lang/ko.lang.php b/modules/point/lang/ko.lang.php
index c3c4d1785..15eb8d59b 100644
--- a/modules/point/lang/ko.lang.php
+++ b/modules/point/lang/ko.lang.php
@@ -48,7 +48,8 @@
     $lang->point_delete_file = '파일 삭제';
     $lang->point_download_file = '파일 다운로드 (이미지 제외)';
     $lang->point_read_document = '게시글 조회';
-
+    $lang->point_voted = '추천 받음';
+    $lang->point_blamed = '비추천 받음';
 
     $lang->cmd_point_config = '기본 설정';
     $lang->cmd_point_module_config = '모듈별 설정';
diff --git a/modules/point/lang/ru.lang.php b/modules/point/lang/ru.lang.php
index ad5e92199..38ff7b1f2 100644
--- a/modules/point/lang/ru.lang.php
+++ b/modules/point/lang/ru.lang.php
@@ -48,6 +48,8 @@
     $lang->point_delete_file = 'При скачке файлов';
     $lang->point_download_file = 'При скачке файлов (кроме изображений)';
     $lang->point_read_document = '게시글 조회';
+    $lang->point_voted = '추천 받음';
+    $lang->point_blamed = '비추천 받음';
 
 
     $lang->cmd_point_config = 'Настройки по умолчанию';
diff --git a/modules/point/lang/zh-CN.lang.php b/modules/point/lang/zh-CN.lang.php
index f7d51e4de..378a64c2d 100644
--- a/modules/point/lang/zh-CN.lang.php
+++ b/modules/point/lang/zh-CN.lang.php
@@ -48,6 +48,8 @@
     $lang->point_delete_file = '删除文件';
     $lang->point_download_file = '下载文件 (图片除外)';
     $lang->point_read_document = '查看主题';
+    $lang->point_voted = '추천 받음';
+    $lang->point_blamed = '비추천 받음';
 
 
     $lang->cmd_point_config = '基本设置';
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index 4ef8cb560..d1fa15f59 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -36,6 +36,8 @@
             $config->insert_comment = (int)$args->insert_comment;
             $config->upload_file = (int)$args->upload_file;
             $config->download_file = (int)$args->download_file;
+	    $config->voted = (int)$args->voted;
+	    $config->blamed = (int)$args->blamed;
 
             // 최고 레벨
             $config->max_level = $args->max_level;
@@ -89,7 +91,7 @@
             $args = Context::getRequestVars();
 
             foreach($args as $key => $val) {
-                preg_match("/^(insert_document|insert_comment|upload_file|download_file|read_document)_([0-9]+)$/", $key, $matches);
+                preg_match("/^(insert_document|insert_comment|upload_file|download_file|read_document|voted|blamed)_([0-9]+)$/", $key, $matches);
                 if(!$matches[1]) continue;
                 $name = $matches[1];
                 $module_srl = $matches[2];
@@ -130,6 +132,8 @@
                 $config->module_point[$srl]['upload_file'] = (int)Context::get('upload_file');
                 $config->module_point[$srl]['download_file'] = (int)Context::get('download_file');
                 $config->module_point[$srl]['read_document'] = (int)Context::get('read_document');
+                $config->module_point[$srl]['voted'] = (int)Context::get('voted');
+                $config->module_point[$srl]['blamed'] = (int)Context::get('blamed');
             }
 
             $oModuleController = &getController('module');
diff --git a/modules/point/point.class.php b/modules/point/point.class.php
index b5c2c93b1..5c67e638f 100644
--- a/modules/point/point.class.php
+++ b/modules/point/point.class.php
@@ -75,6 +75,10 @@
             // 조회
             $config->read_document = 0;
 
+	    // 추천 / 비추천
+	    $config->voted = 0;
+	    $config->blamed = 0;
+
             // 설정 저장
             $oModuleController->insertModuleConfig('point', $config);
 
@@ -96,6 +100,9 @@
             $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
             $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
 
+	    // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
+	    $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+
             return new Object();
         }
 
@@ -121,6 +128,9 @@
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
             if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
 
+	    // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
+	    if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
+
             return false;
         }
 
@@ -160,6 +170,10 @@
             if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
                 $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
 
+	    // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
+	    if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
+		$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index b62e50a0f..349453af7 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -351,6 +351,41 @@
             return new Object();
         }
 
+	/**
+	 * @brief 추천/비추천 시 포인트 적용
+	 **/
+	
+	function triggerUpdateVotedCount(&$obj) {
+            $module_srl = $obj->module_srl;
+            $member_srl = $obj->member_srl;
+            if(!$module_srl || !$member_srl) return new Object();
+
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+    
+	    if( $obj->point > 0 )
+	    {
+		$point = $config->module_point[$module_srl]['voted'];
+		if(!isset($point)) $point = $config->voted;
+	    }
+	    else
+	    {
+		$point = $config->module_point[$module_srl]['blamed'];
+		if(!isset($point)) $point = $config->blamed;
+	    }
+
+            if(!$point) return new Object();
+
+            // 포인트 증감
+            $cur_point += $point;
+            $this->setPoint($member_srl,$cur_point);
+	    
+	    return new Object();
+	}
+
         /**
          * @brief 포인트 설정
          **/
diff --git a/modules/point/point.view.php b/modules/point/point.view.php
index 9c47076bb..d3333ae26 100644
--- a/modules/point/point.view.php
+++ b/modules/point/point.view.php
@@ -42,6 +42,10 @@
                 $module_config['upload_file'] = $config->upload_file;
                 $module_config['download_file'] = $config->download_file;
                 $module_config['read_document'] = $config->read_document;
+
+		//2008.05.13 haneul
+		$module_config['voted'] = $config->voted;
+		$module_config['blamed'] = $config->blamed;
             }
 
             $module_config['module_srl'] = $current_module_srl;
diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html
index 14035a43f..46b23d990 100644
--- a/modules/point/tpl/config.html
+++ b/modules/point/tpl/config.html
@@ -44,7 +44,7 @@
         </td>
     </tr>
     <tr>
-        <th scope="col" rowspan="7">{$lang->is_default}</th>
+        <th scope="col" rowspan="9">{$lang->is_default}</th>
         <td colspan="2">{$lang->point_signup}</th>
         <td>
             <input type="text" class="inputTypeText w80" value="{$config->signup_point}" name="signup_point" /> {$config->point_name}
@@ -75,6 +75,14 @@
         <td colspan="2">{$lang->point_read_document}</td>
         <td><input type="text" name="read_document" value="{$config->read_document}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
+    <tr>
+        <td colspan="2">{$lang->point_voted}</td>
+        <td><input type="text" name="voted" value="{$config->voted}" class="inputTypeText w80" /> {$config->point_name}</td>
+    </tr>
+    <tr>
+        <td colspan="2">{$lang->point_blamed}</td>
+        <td><input type="text" name="blamed" value="{$config->blamed}" class="inputTypeText w80" /> {$config->point_name}</td>
+    </tr>
     <tr>
         <th scope="col">{$lang->level_icon}</th>
         <td colspan="3">
diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html
index 260ec59ab..95fe45fb5 100644
--- a/modules/point/tpl/module_config.html
+++ b/modules/point/tpl/module_config.html
@@ -10,11 +10,13 @@
         <th>{$lang->point_upload_file}</th>
         <th>{$lang->point_download_file}</th>
         <th>{$lang->point_read_document}</th>
+        <th>{$lang->point_voted}</th>
+        <th>{$lang->point_blamed}</th>
     </tr>
     <!--@foreach($mid_list as $key => $val)-->
     <!--@if(in_array($val->module,array('guestbook','board','blog')))-->
     <tr>
-        <th colspan="5" scope="col">{$val->browser_title} ({$val->mid})</th>
+        <th colspan="7" scope="col">{$val->browser_title} ({$val->mid})</th>
     </tr>
     <tr>
         <td><input type="text" name="insert_document_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['insert_document']}" class="inputTypeText w40" /> {$config->point_name}</td>
@@ -22,6 +24,8 @@
         <td><input type="text" name="upload_file_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['upload_file']}" class="inputTypeText w40" /> {$config->point_name}</td>
         <td><input type="text" name="download_file_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['download_file']}" class="inputTypeText w40" /> {$config->point_name}</td>
         <td><input type="text" name="read_document_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['read_document']}" class="inputTypeText w40" /> {$config->point_name}</td>
+        <td><input type="text" name="voted_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['voted']}" class="inputTypeText w40" /> {$config->point_name}</td>
+        <td><input type="text" name="blamed_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['blamed']}" class="inputTypeText w40" /> {$config->point_name}</td>
     </tr>
     <!--@end-->
     <!--@end-->
diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html
index 0ac5d524f..378a2bc2b 100644
--- a/modules/point/tpl/point_module_config.html
+++ b/modules/point/tpl/point_module_config.html
@@ -27,6 +27,14 @@
         <th>{$lang->point_read_document}</th>
         <td><input type="text" name="read_document" value="{$module_config['read_document']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
     </tr>
+    <tr>
+        <th>{$lang->point_voted}</th>
+        <td><input type="text" name="voted" value="{$module_config['voted']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
+    </tr>
+    <tr>
+        <th>{$lang->point_blamed}</th>
+        <td><input type="text" name="blamed" value="{$module_config['blamed']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
+    </tr>
     <tr>
         <th colspan="2" class="button"><span class="button"><input type="submit" value="{$lang->cmd_save}" /></span></th>
     </tr>

From 31651eb40b5416633b56564d615f9de8323ddd3a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 14 May 2008 07:53:02 +0000
Subject: [PATCH 097/111] =?UTF-8?q?=EC=84=A4=EC=B9=98=ED=99=94=EB=A9=B4?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=96=B8=EC=96=B4=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9E=98=EB=AA=BB=20=EB=82=98=ED=83=80=EB=82=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0.=20firebird?=
 =?UTF-8?q?=20description=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@4195 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/en.lang.php    |   1 +
 modules/install/lang/es.lang.php    | 561 ++++++++++++++--------------
 modules/install/lang/fr.lang.php    |   1 +
 modules/install/lang/jp.lang.php    |   1 +
 modules/install/lang/ko.lang.php    |   1 +
 modules/install/lang/ru.lang.php    |   1 +
 modules/install/lang/zh-CN.lang.php | 539 +++++++++++++-------------
 modules/install/tpl/introduce.html  |   4 +-
 8 files changed, 557 insertions(+), 552 deletions(-)

diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php
index 7829a59d1..0a0ea0abe 100644
--- a/modules/install/lang/en.lang.php
+++ b/modules/install/lang/en.lang.php
@@ -146,6 +146,7 @@ EndOfLicense;
         'sqlite3_pdo' => 'Suppots sqlite3 by PHP\'s PDO.<br />When installing, DB file should be created at unreachable place from web.',
         'cubrid' => 'Use CUBRID DB.',
         'postgresql' => 'Use PostgreSql DB.',
+        'firebird' => 'Use firebird DB.',
     );
 
     $lang->form_title = 'Please input DB &amp; Admin information';
diff --git a/modules/install/lang/es.lang.php b/modules/install/lang/es.lang.php
index 32fa12cf2..20641fab5 100644
--- a/modules/install/lang/es.lang.php
+++ b/modules/install/lang/es.lang.php
@@ -1,282 +1,283 @@
-<?php
-    /**
-     * @archivo  es.lang.php
-     * @autor zero (zero@nzeo.com)
-     * @sumario Paquete del idioma espanol para la instalación
-     **/
-
-    $lang->introduce_title = 'Instalación de Zeroboard XE ';
-    $lang->license = <<<EndOfLicense
-- Nombre de programa : zeroboard XE (zeroboardXE)
-- Licencia : GNU GENERAL PUBLIC LICENSE
-- Official website : <a href="http://www.zeroboard.com">http://www.zeroboard.com</a>
-- Autor : zero (zero@zeroboard.com, http://www.zeroboard.com)
-
-Esta es la traducción al español de la famosa licencia GPL "GNU Public License" (GPL), version 2 que cubre la mayor parte del software de la Free Software Foundation, y muchos más programas.
-
-IMPORTANTE: Esta traducción tiene caráter meramente informativo y carece de validez legal. Si distribuye software libre o ha recibido software libre con esta traducción utilice para cuestiones legales siempre la GPL versión 2 en Inglés de la Free Software Foundation. 
-
-GNU GENERAL PUBLIC LICENSE (GPL)
-Versi? 2, Junio 1991 
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. Está permitido copiar y distribuir copias idénticas de esta licencia, pero no esta permitida su modificación. 
-
-Preámbulo
-
-Las licencias de la mayoría del software estan diseñadas para eliminar su libertad de compartir y modificar dicho software. Por el contrario, la GNU General Public License (GPL) está diseñada para garantizar su libertad de compartir y modificar el software. Software libre para garantizar la libertad de sus usuarios. Esta licencia GNU General Public License (GPL) se aplica en la mayoría de los programas realizado por la Free Software Foundation (FSF, Fundacion del Software Libre) y en cualquier otro programa en los que los autores quieran aplicarla. También, muchos otros programas de la Free Software Foundation están cubiertos por la GNU Lesser General Public License (LGPL) e igualmente puede usarla para cubrir sus programas. 
-
-Cuando hablamos de Software Libre, hablamos de libertad, no de precio. Nuestra licencia General Public License (GPL) esta diseñada para asegurarle las libertades de distribuir copias de Software Libre (y cobrar por ese servicio si quiere), asegurarle que recibira el código fuente del programa o bien podrá conseguirlo si quiere, asegurarle que puede modificar el programa o modificar algunas de sus piezas para un nuevo programa y para garantizarle que puede hacer todas estas cosas. 
-
-Para proteger sus derechos, necesitamos realizar restricciones que prohiben a cualquiera denegar estos derechos o pedirle que reniegue de sus derechos. Estas restricciones se traducen en ciertas obligaciones por su parte si usted piensa distribuir copias del programa o tiene intencióde modificarlo. 
-
-Por ejemplo, si usted distribuye copias de un programa, ya sea gratuitamente o no, usted tiene que otorgar a sus clientes todos los derechos que ha adquirido usted con el programa. Usted tiene que asegurarse de que sus clientes reciban o pueden recibir el código fuente si lo solicitan y usted tiene que mostrarles los términos de la licencia para que conozcan sus derechos. 
-
-Nosotros protegemos los derechos con dos pasos:
-(1) utilizando el copyright en nuestros programas, y
-(2) ofreciendole esta licencia que le garantiza legalmente el derecho a copia, redistribución y/o modificación de este programa. 
-
-Además, para nuestra protección y la de cada uno de los autores, queremos tener la certeza de que todo el mundo entienda que no hay ninguna garantía por este Software Libre. Si el programa es modificado por alguien más y este falla, ese software no es el original y por tanto cualquier problema introducido por otras personas no afecta a la reputación de los autores originales. 
-
-Por último, cualquier programa esta amenazado constantemente por las patentes de software. Deseamos evitar el riesgo que distribuidores de programas libres adquieran individualmente patentes, transformando de facto el software libre en privativo. Para evitar este problema, dejamos claro que cualquier patente debera ser licenciada para permitir el uso libre de cualquier persona o de no patentada. 
-
-Los términos y condiciones para la copia, distribución y modificación del software se especifican en el siguiente punto. 
-
-TERMINOS Y CONDICIONES PARA LA COPIA, DISTRIBUCION Y MODIFICACION
-
-0.La licencia se aplica a cualquier programa u otro trabajo que contenga un aviso del dueno del copyright diciendo que el software debe ser distribuido bajo los términos y condiciones de esta licencia General Public License (GPL). El "programa", desde ahora, se refiere tanto a el Programa como a cualquier trabajo derivado bajo la ley del copyrigth: es decir, un trabajo que contenga el programa o una porción de ella, tanto copia como con modificaciones y/o traducido a otra lengua (más abajo, la traducción esta incluida sin limitaciones en el término "Modificación".) Cada licencia esta asignada a usted. 
-
-Otras actividades distintas de la copia, distribución y modificación no estan cubiertas por esta licencia y esta fuera de su objetivo. Ejecutar el programa no esta restringido, y el resultado del programa esta cubierto por la licencia solo si su contenido contribuye parte de un trabajo derivado del Programa (independiente de la ejecución del programa). Incluso si esto es verdad, depende de lo que haga el programa. 
-
-1. Usted puede copiar y distribuir copias exactas del código fuente del Programa tal y como lo recibio usando cualquier medio, a condición de, adecuadamente y de forma bien visible, publique en cada copia una nota de copyright y un repudio de garantia; mantenga intactas todas las notas que se refieran a esta licencia y a la exención de garantía; y proporcione a los receptores del Programa una copia de esta Licencia junto al programa. 
-Usted puede cobrar unos honorarios por la transferencia física de la copia, y puede a su criterio ofrecer una garantia adicional por un precio. 
-
-2. Usted puede modificar su copia o copias del Programa o cualquier porción de ella, obteniendo asi un trabajo derivado del Programa, y copiar y distribuir estas modificaciones o trabajo derivado bajo los mismos término de la Sección 1, antedicho, cumpliendo además las siguientes condiciones: 
-
-
-a) Debe hacer que los ficheros modificados contengan información visible de que ha modificado el fichero y la fecha de cualquier cambios.
-b) Debe hacer que cualquier trabajo que distribuya o publique y que en su totalidad o en parte contenga o sea derivado del Programa o de cualquier parte de el, sea licenciado como un todo, sin carga alguna a las terceras partes, bajo los términos de esta licencia.
-c) Si la modificación del programa normalmente interpreta comandos interactivos en su ejecución, debe, cuando comience su ejecución para ese uso interactivo de la forma mas habitual, imprimir o mostrar un aviso de exención de garantía (o por el contrario que si ofrece garantía) y de como los usuarios pueden redistribuir el programa bajo estas condiciones, e informando a los usuarios de como pueden obtener una copia de esta Licencia. (Excepción: Si el programa es interactivo pero normalmente no muestra este anuncio, no es necesario en un trabajo derivado mostrar este aviso).
-
-
-Estos requisitos se aplican a las modificaciones como un todo. Si secciones identificables del trabajo no estan derivadas del Programa, pueden ser razonablemente consideradas independientes y trabajos separados en si mismos, por tanto esta Licencia, y sus términos, no se aplican a estas secciones cuando usted las distribuye como trabajos independientes. Pero cuando usted distribuye las mismas secciones como parte de un todo que es un trabajo derivado del Programa, la distribución del todo debe respetar los términos de esta licencia, cuyos permisos para otros licenciatarios se extienden al todo, y por lo tanto a todas y cada una de sus partes, con independencia de quien la escribio. 
-
-Por lo tanto, no es la intención de esta seccion reclamar derechos o desafiar sus derechos sobre trabajos escritos totalmente por usted mismo. Por el contrario, la intención es ejercer el derecho a controlar la distribución de trabajos derivados o colectivos basados en el Programa. 
-
-Además, el mero acto de agregar otro trabajo no basado en el Programa con el Programa (o con otro trabajo derivado del Programa) en un volumen de almacenamiento o un medio de distribución no consigue que el otro trabajo se encuentre bajo los términos de esta licencia. 
-
-3. Usted puede modificar su copia y distribuir el Programa (o un trabajo derivado, cubierto bajo la Sección 2) en formato objeto o ejecutable bajo los terminos de las Secciones 1 y 2 antedichas proporcionado con el al menos una de las siguientes: 
-
-
-a) Acompanando el Programa con el código fuente completo, legible por un ordenador, correspondiente a la arquitectura correspondiente, que debe ser distribuido bajo los términos de las secciones 1 y 2 usando un medio físico habitual en el intercambio de software; o, 
-
-
-b) Acompanando el Programa con una oferta por escrito, válida al menos por tres años, de facilitar a cualquier tercera parte, sin un cargo mayor del costo del medio físico, una copia completa legible por un ordenador del código fuente de la arquitectura elegida, que sera distribuido bajo los términos de las Secciones 1 y 2 usando un medio físico habitual en el intercambio de software; o, 
-
-
-c) Acompanando el Programa con la información que recibio ofreciendo distribuir el código fuente correspondiente. (Esta opción se permite sólo para distribuir software gratuito -no comercial- y sólo si recibio el programa como código objeto o en formato ejecutable con esta misma oferta, de acuerdo con el apartado b anterior). 
-Por código fuente de un trabajo se entiende la forma íntima para realizar modificaciones en el. Para un programa ejecutable, el código fuente completo se refiere a todo el código fuente para todos los módulos que contiene, mas cualquier fichero asociado de definición de interfaces, mas el script utilizado para la compilación y la instalación del ejecutable. Sin embargo, como una excepcion especial, el código fuente distribuido no necesita incluir nada que no sea normalmente distribuido (ni en código fuente o en forma binaria) con los componentes más importantes (compiladores, kernels y demás) del sistema operativo donde corre el ejecutable, salvo que el componente acompana al ejecutable. 
-
-Si la distribución de ejecutables o compilado se realiza ofreciendo acceso a un sitio para la copia, entonces ofrecer un acceso equivalente de copia desde un sitio para el código fuente cuenta como una distribución de código fuente, incluso aunque terceras partes no estan obligadas a copiar el código fuente con el código compilado. 
-
-4. Usted no debe copiar, modificar, sublicenciar o distribuir el Programa excepto como esta permitido expresamente en esta Licencia. Cualquier intento de copiar, modificar, sublicenciar o distribuir el Programa que no esta incluido en la Licencia esta prohibido, y anulara automáticamente los derechos otorgados por esta licencia. Sin embargo, las partes que hayan recibido copias, o derechos, por usted bajo esta Licencia no vera sus licencias terminadas mientras estas partes continuen cumpliendo los téminos de esta licencia. 
-
-5. Usted no esta obligado a aceptar esta licencia, ya que usted no la ha firmado. Sin embargo, nada más le garantiza los derechos de modificación o distribución del programa o de sus trabajos derivados. Estas acciones estan prohibidas por la ley si usted no acepta esta Licencia. En cualquier caso, por modificar o distribuir el programa (o cualquier trabajo derivado del programa), usted indica su aceptacion implícita de esta Licencia, ya que la necesita para hacerlo, y todos sus términos y condiciones de copia, distribución o modificación del Programa o trabajos derivados. 
-
-6. Cada vez que usted redistribuya el Programa (o cualquier trabajo derivado del Programa), el receptor automáticamente recibe la licencia por parte del licenciatario original para copiar, distribuir o modificar el Programa sujeto a estos términos y condiciones. Usted no puede imponer ninguna otra restricción a los receptores limitando los derechos garantizados en esta Licencia. Usted no es responsable de asegurar el cumplimiento de terceras partes sobre la Licencia. 
-
-7. Si, como consecuencia de una decisión judicial o una acusación de infracción de patentes o por cualquier otra razón (no limitada a una causa de patentes), le son impuestas condiciones (ya sea por una orden judicial, por un acuerdo o cualquier otra forma) que contradiga los términos y condiciones d esta Licencia, no le exime de cumplir los términos y condiciones de dicha Licencia. Si usted no puede distribuir el Programa cumpliendo simultaneamente tanto los términos y condiciones de la Licencia como cualquier otra obligación que le haya sido impuesta, usted consecuentemente no puede distribuir el Programa bajo ninguna forma. Por ejemplo, si una patente no permite la redistribución gratuita del Programa por parte de todos aquellos que reciben copias directa o indirectamente a traves de usted, entonces la unica forma de satisfacer tanto esa condición como los términos y condiciones de esta Licencia sera evitar completamente la distribución del Programa. 
-
-Si alguna porción de esta sección es inválida o imposible de cumplir bajo una circunstancia particular, el resto de la sección tiene que intentar aplicarse y la seccion completa debe aplicarse en cualquier otra circunstancia. 
-
-El proposito de esta sección no es inducir a infringir ninguna patente o otros derechos de propiedad o impugnar la validez de estos derechos; esta sección tiene el único propósito de proteger la integridad del sistema de distribución del Software Libre, que esta implementado bajo practicas de licencias públicas. Mucha gente ha realizado generosas contribuciones a la gran variedad de software distribuido bajo este sistema con confianza en una aplicación consistente del sistema; sera el autor/donante quien decida si quiere distribuir software mediante cualquier otro sistema y una licencia no puede imponer esa elección. 
-
-Este apartado pretende dejar completamente claro lo que se cree que es una consecuencia del resto de esta Licencia. 
-
-8. Si la distribución y/o el uso del Programa esta restringido en ciertos países, ya sea por patentes o por interfaces bajo copyright, el propietario del Copyright original que pone el Programa bajo esta Licencia debe añadir unos limites geograficos expecíficos excluyendo esos países, por lo que la distribución solo estara permitida en los países no excluidos. En este caso, la Licencia incorpora la limitación de escribir en el cuerpo de esta Licencia. 
-
-9. La Free Software Foundation puede publicar versiones revisadas y/o nuevas de la Licencia GPL de vez en cuando. Dichas versiones seran similares en espíritu a la presente versión, pero pueden ser diferentes en detalles para considerar nuevos problemas o situaciones. 
-
-Cada versión tiene un numero de version propio. Si el Programa especifica un numero de versión de esta Licencia que hace referencia a esta o "cualquier versión posterior", usted tiene la opción de seguir los términos y condiciones de o bien la versión referenciada o bien cualquiera de las versiones posteriores publicadas por la Free Software Foundation. Si el Programa no especifica ningún número de versión, usted debe elegir cualquiera de las versiones publicadas por la Free Software Foundation. 
-
-10. Si usted quiere incorporar parte del Programa en otros programas libres cuyas condiciones de distribucion son diferentes, escriba al autor para pedir permiso. Para el software con el copyrigth bajo la Free Software Foundation, escriba a la Free Software Foundation; algunas veces hacemos excepciones en esto. Nuestra decisión estara guiada por los objetivos de preservar la libertad del software y de los trabajos derivados y el de promocionar el intercambio y reutilización del software en general. 
-
-SIN GARANTIA
-
-11. DADO QUE ESTE PROGRAMA ESTALICENCIADO LIBRE DE COSTE, NO EXISTE GARANTIA PARA EL PROGRAMA, EN TODA LA EXTENSION PERMITIDA POR LA LEY APLICABLE. EXCEPTO CUANDO SE INDIQUE POR ESCRITO, LOS DUENOS DEL COPYRIGHT Y/O OTRAS PARTES PROVEEDORAS FACILITAN EL PROGRAMA "TAL CUAL" SI GARANTIA DE NINGUNA CLASE, NI EXPLICITA NI IMPLICITA, INCLUYENDO, PERO NO LIMITANDO, LAS GARANTIAS APLICABLES MERCANTILES O DE APLICABILIDAD PARA UN PROPOSITO PARTICULAR. USTED ASUME CUALQUIER RIESGO SOBRE LA CALIDAD O LAS PRESTACIONES DEL PROGRAMA. SI EL PROGRAMA TIENE UN ERROR, USTED ASUME EL COSTE DE TODOS LOS SERVICIOS NECESARIOS PARA REPARARLO O CORREGIRLO. 
-
-12. EN NINGUN CASO, EXCEPTO CUANDO SEA REQUERIDO POR LA LEGISLACION APLICABLE O HAYA SIDO ACORDADO POR ESCRITO, NINGUN PROPIETARIO DEL COPYRIGTH NI NINGUNA OTRA PARTE QUE MODIFIQUE Y/O REDISTRIBUYA EL PROGRAMA SEGUN SE PERMITE EN ESTA LICENCIA SERA RESPONSABLE POR DANOS, INCLUYENDO CUALQUIER DANO GENERAL, ESPECIAL ACCIDENTAL O RESULTANTE PRODUCIDO POR EL USO O LA IMPOSIBILIDAD DE USO DEL PROGRAMA (CON INCLUSION PERO SIN LIMITACION DE LA PERDIDA DE DATOS O A LA GENERACION INCORRECTA DE DATOS O A LAS PERDIDAS OCASIONADAS O POR USTED O POR TERCERAS PARTES, O A UN FALLO DEL PROGRAMA AL FUNCIONAR EN COMBINACION CON CUALQUIER OTRO PROGRAMA), INCLUSO SI DICHO PROPIETARIO U OTRA PARTE HA SIDO ADVERTIDO SOBRE LA POSIBILIDAD DE DICHOS DANOS. 
-
-FIN DE TERMINOS Y CONDICIONES
-
-
-<b>GPL version 2 oficial en Ingles</b> - 
-
-GNU GENERAL PUBLIC LICENSE
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
-b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
-c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
-
-
-
-
-
-EndOfLicense;
-
-    $lang->install_condition_title = "Por favor chequee los requerimientos de la instalación.";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'Versión PHP',
-            'permission' => 'Atribución',
-            'xml' => 'Librería XML',
-            'iconv' => 'Librería ICONV',
-            'gd' => 'Librería GD',
-            'session' => 'Configuración Session.auto_start',
-        );
-
-    $lang->install_checklist_desc = array(
-			'php_version' => '[Requerido] Si la versión de PHP es 5.2.2, zeroboard no sera instalado por errores',
-            'permission' => '[Requerido] La ruta de la instalación de Zeroboard o el directorio de ./archivos deberia tener la atribución 707',
-            'xml' => '[Requerido] Libreria XML es necesario para la comunicación de XML',
-            'session' => '[Requerido] Para el uso de la sesion de Zeroboard, el archivo php.ini deberia estar configurada  session.auto_start=0',
-            'iconv' => 'Para transformar UTF-8 y otra paquete del idioma deberia estar instalado el Iconv.',
-            'gd' => 'Libreria GD deberia estar instalado para utilizar la funcion de convertir la imagen',
-        );
-
-    $lang->install_checklist_xml = 'Instalar Librería XML ';
-    $lang->install_without_xml = 'Librería XML no esta instalado';
-    $lang->install_checklist_gd = 'Instalar Librería GD';
-    $lang->install_without_gd  = 'Libreria GD no esta instalado para la conversión de la imagen';
-    $lang->install_checklist_gd = 'Intalar Librería GD';
-    $lang->install_without_iconv = 'Libreria Iconv no esta instalado para procesar las fuentes';
-    $lang->install_session_auto_start = 'Puede provocar errores si en la configuración de php esta configurada "session.auto_start=1"';
-    $lang->install_permission_denied = 'La atribución de la ruta de instalacion no es igual a 707';
-
-    $lang->cmd_agree_license = 'Yo accepto la licencia';
-    $lang->cmd_install_fix_checklist = 'Yo he configurado las condiciones necesarias para la instalación.';
-    $lang->cmd_install_next = 'Continuar la instalación';
-
-    $lang->db_desc = array(
-        'mysql' => 'Utilizando las funciones mysql*() de PHP usar DB mysql.<br />La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.',
-        'mysql_innodb' => 'Utilizando innodb usar BD mysql.<br />La transacción es hablilitado para innodb',
-        'sqlite2' => 'Soporta sqlite2, el cual almacena los datos en archivos <br />En la instalacion, es necesario crear archivo de BD en un lugar inaccesible de la web.<br />(Testeo de la estabilización no realizada)',
-        'sqlite3_pdo' => 'A través de PDO de PHP soporta sqlite2 <br />En la instalación, es necesario crear archivo de BD en un lugar inaccesible de la web.',
-        'cubrid' => 'Usar BD CUBRID.',
-        'postgresql' => 'Usar BD PostgreSql.',
-    );
-
-    $lang->form_title = 'Ingresar  BD &amp; Información del Administrador;';
-    $lang->db_title = 'Por favor escribir información de BD';
-    $lang->db_type = 'Tipo de BD';
-    $lang->select_db_type = 'Seleccione el tipo de BD que desea usar.';
-    $lang->db_hostname = 'Hostname de BD';
-    $lang->db_port = 'Port de BD';
-    $lang->db_userid = 'ID de BD';
-    $lang->db_password = 'Contraseña de BD';
-    $lang->db_database = 'Base de datos BD';
-    $lang->db_database_file = 'Archivo de base de datos BD';
-    $lang->db_table_prefix = 'Encabezado de la tabla';
-
-    $lang->admin_title = 'Información del Administrator';
-
-    $lang->env_title = 'Configuración';
-    $lang->use_optimizer = 'Habilitar el optimizador';
-    $lang->about_optimizer = 'Si optimizador está habilitado, los usuarios pueden acceder rápidamente a este sitio, ya que hay múltiples CSS / JS archivos son comprimidos juntos y antes de la transmisión. <br /> No obstante, esta optimización podría ser problemáticas de acuerdo con CSS o JS. Si inhabilitarlo, que funciona correctamente a pesar de que sería más lento el trabajo.';
-    $lang->use_rewrite = 'Usar rewrite mod';
-    $lang->about_rewrite = "Si el servidor de la web soporte rewrite mod, URL largas como http://bla/?documento_srl=123 puede abreviarse como  http://bla/123";
-    $lang->time_zone = 'La Hora por Zona';
-    $lang->about_time_zone = "Si la hora del servidor y la hora de su ubicación es diferente, Usted puede elegir la hora por zona para corregir";
+<?php
+    /**
+     * @archivo  es.lang.php
+     * @autor zero (zero@nzeo.com)
+     * @sumario Paquete del idioma espanol para la instalación
+     **/
+
+    $lang->introduce_title = 'Instalación de Zeroboard XE ';
+    $lang->license = <<<EndOfLicense
+- Nombre de programa : zeroboard XE (zeroboardXE)
+- Licencia : GNU GENERAL PUBLIC LICENSE
+- Official website : <a href="http://www.zeroboard.com">http://www.zeroboard.com</a>
+- Autor : zero (zero@zeroboard.com, http://www.zeroboard.com)
+
+Esta es la traducción al español de la famosa licencia GPL "GNU Public License" (GPL), version 2 que cubre la mayor parte del software de la Free Software Foundation, y muchos más programas.
+
+IMPORTANTE: Esta traducción tiene caráter meramente informativo y carece de validez legal. Si distribuye software libre o ha recibido software libre con esta traducción utilice para cuestiones legales siempre la GPL versión 2 en Inglés de la Free Software Foundation. 
+
+GNU GENERAL PUBLIC LICENSE (GPL)
+Versi? 2, Junio 1991 
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. Está permitido copiar y distribuir copias idénticas de esta licencia, pero no esta permitida su modificación. 
+
+Preámbulo
+
+Las licencias de la mayoría del software estan diseñadas para eliminar su libertad de compartir y modificar dicho software. Por el contrario, la GNU General Public License (GPL) está diseñada para garantizar su libertad de compartir y modificar el software. Software libre para garantizar la libertad de sus usuarios. Esta licencia GNU General Public License (GPL) se aplica en la mayoría de los programas realizado por la Free Software Foundation (FSF, Fundacion del Software Libre) y en cualquier otro programa en los que los autores quieran aplicarla. También, muchos otros programas de la Free Software Foundation están cubiertos por la GNU Lesser General Public License (LGPL) e igualmente puede usarla para cubrir sus programas. 
+
+Cuando hablamos de Software Libre, hablamos de libertad, no de precio. Nuestra licencia General Public License (GPL) esta diseñada para asegurarle las libertades de distribuir copias de Software Libre (y cobrar por ese servicio si quiere), asegurarle que recibira el código fuente del programa o bien podrá conseguirlo si quiere, asegurarle que puede modificar el programa o modificar algunas de sus piezas para un nuevo programa y para garantizarle que puede hacer todas estas cosas. 
+
+Para proteger sus derechos, necesitamos realizar restricciones que prohiben a cualquiera denegar estos derechos o pedirle que reniegue de sus derechos. Estas restricciones se traducen en ciertas obligaciones por su parte si usted piensa distribuir copias del programa o tiene intencióde modificarlo. 
+
+Por ejemplo, si usted distribuye copias de un programa, ya sea gratuitamente o no, usted tiene que otorgar a sus clientes todos los derechos que ha adquirido usted con el programa. Usted tiene que asegurarse de que sus clientes reciban o pueden recibir el código fuente si lo solicitan y usted tiene que mostrarles los términos de la licencia para que conozcan sus derechos. 
+
+Nosotros protegemos los derechos con dos pasos:
+(1) utilizando el copyright en nuestros programas, y
+(2) ofreciendole esta licencia que le garantiza legalmente el derecho a copia, redistribución y/o modificación de este programa. 
+
+Además, para nuestra protección y la de cada uno de los autores, queremos tener la certeza de que todo el mundo entienda que no hay ninguna garantía por este Software Libre. Si el programa es modificado por alguien más y este falla, ese software no es el original y por tanto cualquier problema introducido por otras personas no afecta a la reputación de los autores originales. 
+
+Por último, cualquier programa esta amenazado constantemente por las patentes de software. Deseamos evitar el riesgo que distribuidores de programas libres adquieran individualmente patentes, transformando de facto el software libre en privativo. Para evitar este problema, dejamos claro que cualquier patente debera ser licenciada para permitir el uso libre de cualquier persona o de no patentada. 
+
+Los términos y condiciones para la copia, distribución y modificación del software se especifican en el siguiente punto. 
+
+TERMINOS Y CONDICIONES PARA LA COPIA, DISTRIBUCION Y MODIFICACION
+
+0.La licencia se aplica a cualquier programa u otro trabajo que contenga un aviso del dueno del copyright diciendo que el software debe ser distribuido bajo los términos y condiciones de esta licencia General Public License (GPL). El "programa", desde ahora, se refiere tanto a el Programa como a cualquier trabajo derivado bajo la ley del copyrigth: es decir, un trabajo que contenga el programa o una porción de ella, tanto copia como con modificaciones y/o traducido a otra lengua (más abajo, la traducción esta incluida sin limitaciones en el término "Modificación".) Cada licencia esta asignada a usted. 
+
+Otras actividades distintas de la copia, distribución y modificación no estan cubiertas por esta licencia y esta fuera de su objetivo. Ejecutar el programa no esta restringido, y el resultado del programa esta cubierto por la licencia solo si su contenido contribuye parte de un trabajo derivado del Programa (independiente de la ejecución del programa). Incluso si esto es verdad, depende de lo que haga el programa. 
+
+1. Usted puede copiar y distribuir copias exactas del código fuente del Programa tal y como lo recibio usando cualquier medio, a condición de, adecuadamente y de forma bien visible, publique en cada copia una nota de copyright y un repudio de garantia; mantenga intactas todas las notas que se refieran a esta licencia y a la exención de garantía; y proporcione a los receptores del Programa una copia de esta Licencia junto al programa. 
+Usted puede cobrar unos honorarios por la transferencia física de la copia, y puede a su criterio ofrecer una garantia adicional por un precio. 
+
+2. Usted puede modificar su copia o copias del Programa o cualquier porción de ella, obteniendo asi un trabajo derivado del Programa, y copiar y distribuir estas modificaciones o trabajo derivado bajo los mismos término de la Sección 1, antedicho, cumpliendo además las siguientes condiciones: 
+
+
+a) Debe hacer que los ficheros modificados contengan información visible de que ha modificado el fichero y la fecha de cualquier cambios.
+b) Debe hacer que cualquier trabajo que distribuya o publique y que en su totalidad o en parte contenga o sea derivado del Programa o de cualquier parte de el, sea licenciado como un todo, sin carga alguna a las terceras partes, bajo los términos de esta licencia.
+c) Si la modificación del programa normalmente interpreta comandos interactivos en su ejecución, debe, cuando comience su ejecución para ese uso interactivo de la forma mas habitual, imprimir o mostrar un aviso de exención de garantía (o por el contrario que si ofrece garantía) y de como los usuarios pueden redistribuir el programa bajo estas condiciones, e informando a los usuarios de como pueden obtener una copia de esta Licencia. (Excepción: Si el programa es interactivo pero normalmente no muestra este anuncio, no es necesario en un trabajo derivado mostrar este aviso).
+
+
+Estos requisitos se aplican a las modificaciones como un todo. Si secciones identificables del trabajo no estan derivadas del Programa, pueden ser razonablemente consideradas independientes y trabajos separados en si mismos, por tanto esta Licencia, y sus términos, no se aplican a estas secciones cuando usted las distribuye como trabajos independientes. Pero cuando usted distribuye las mismas secciones como parte de un todo que es un trabajo derivado del Programa, la distribución del todo debe respetar los términos de esta licencia, cuyos permisos para otros licenciatarios se extienden al todo, y por lo tanto a todas y cada una de sus partes, con independencia de quien la escribio. 
+
+Por lo tanto, no es la intención de esta seccion reclamar derechos o desafiar sus derechos sobre trabajos escritos totalmente por usted mismo. Por el contrario, la intención es ejercer el derecho a controlar la distribución de trabajos derivados o colectivos basados en el Programa. 
+
+Además, el mero acto de agregar otro trabajo no basado en el Programa con el Programa (o con otro trabajo derivado del Programa) en un volumen de almacenamiento o un medio de distribución no consigue que el otro trabajo se encuentre bajo los términos de esta licencia. 
+
+3. Usted puede modificar su copia y distribuir el Programa (o un trabajo derivado, cubierto bajo la Sección 2) en formato objeto o ejecutable bajo los terminos de las Secciones 1 y 2 antedichas proporcionado con el al menos una de las siguientes: 
+
+
+a) Acompanando el Programa con el código fuente completo, legible por un ordenador, correspondiente a la arquitectura correspondiente, que debe ser distribuido bajo los términos de las secciones 1 y 2 usando un medio físico habitual en el intercambio de software; o, 
+
+
+b) Acompanando el Programa con una oferta por escrito, válida al menos por tres años, de facilitar a cualquier tercera parte, sin un cargo mayor del costo del medio físico, una copia completa legible por un ordenador del código fuente de la arquitectura elegida, que sera distribuido bajo los términos de las Secciones 1 y 2 usando un medio físico habitual en el intercambio de software; o, 
+
+
+c) Acompanando el Programa con la información que recibio ofreciendo distribuir el código fuente correspondiente. (Esta opción se permite sólo para distribuir software gratuito -no comercial- y sólo si recibio el programa como código objeto o en formato ejecutable con esta misma oferta, de acuerdo con el apartado b anterior). 
+Por código fuente de un trabajo se entiende la forma íntima para realizar modificaciones en el. Para un programa ejecutable, el código fuente completo se refiere a todo el código fuente para todos los módulos que contiene, mas cualquier fichero asociado de definición de interfaces, mas el script utilizado para la compilación y la instalación del ejecutable. Sin embargo, como una excepcion especial, el código fuente distribuido no necesita incluir nada que no sea normalmente distribuido (ni en código fuente o en forma binaria) con los componentes más importantes (compiladores, kernels y demás) del sistema operativo donde corre el ejecutable, salvo que el componente acompana al ejecutable. 
+
+Si la distribución de ejecutables o compilado se realiza ofreciendo acceso a un sitio para la copia, entonces ofrecer un acceso equivalente de copia desde un sitio para el código fuente cuenta como una distribución de código fuente, incluso aunque terceras partes no estan obligadas a copiar el código fuente con el código compilado. 
+
+4. Usted no debe copiar, modificar, sublicenciar o distribuir el Programa excepto como esta permitido expresamente en esta Licencia. Cualquier intento de copiar, modificar, sublicenciar o distribuir el Programa que no esta incluido en la Licencia esta prohibido, y anulara automáticamente los derechos otorgados por esta licencia. Sin embargo, las partes que hayan recibido copias, o derechos, por usted bajo esta Licencia no vera sus licencias terminadas mientras estas partes continuen cumpliendo los téminos de esta licencia. 
+
+5. Usted no esta obligado a aceptar esta licencia, ya que usted no la ha firmado. Sin embargo, nada más le garantiza los derechos de modificación o distribución del programa o de sus trabajos derivados. Estas acciones estan prohibidas por la ley si usted no acepta esta Licencia. En cualquier caso, por modificar o distribuir el programa (o cualquier trabajo derivado del programa), usted indica su aceptacion implícita de esta Licencia, ya que la necesita para hacerlo, y todos sus términos y condiciones de copia, distribución o modificación del Programa o trabajos derivados. 
+
+6. Cada vez que usted redistribuya el Programa (o cualquier trabajo derivado del Programa), el receptor automáticamente recibe la licencia por parte del licenciatario original para copiar, distribuir o modificar el Programa sujeto a estos términos y condiciones. Usted no puede imponer ninguna otra restricción a los receptores limitando los derechos garantizados en esta Licencia. Usted no es responsable de asegurar el cumplimiento de terceras partes sobre la Licencia. 
+
+7. Si, como consecuencia de una decisión judicial o una acusación de infracción de patentes o por cualquier otra razón (no limitada a una causa de patentes), le son impuestas condiciones (ya sea por una orden judicial, por un acuerdo o cualquier otra forma) que contradiga los términos y condiciones d esta Licencia, no le exime de cumplir los términos y condiciones de dicha Licencia. Si usted no puede distribuir el Programa cumpliendo simultaneamente tanto los términos y condiciones de la Licencia como cualquier otra obligación que le haya sido impuesta, usted consecuentemente no puede distribuir el Programa bajo ninguna forma. Por ejemplo, si una patente no permite la redistribución gratuita del Programa por parte de todos aquellos que reciben copias directa o indirectamente a traves de usted, entonces la unica forma de satisfacer tanto esa condición como los términos y condiciones de esta Licencia sera evitar completamente la distribución del Programa. 
+
+Si alguna porción de esta sección es inválida o imposible de cumplir bajo una circunstancia particular, el resto de la sección tiene que intentar aplicarse y la seccion completa debe aplicarse en cualquier otra circunstancia. 
+
+El proposito de esta sección no es inducir a infringir ninguna patente o otros derechos de propiedad o impugnar la validez de estos derechos; esta sección tiene el único propósito de proteger la integridad del sistema de distribución del Software Libre, que esta implementado bajo practicas de licencias públicas. Mucha gente ha realizado generosas contribuciones a la gran variedad de software distribuido bajo este sistema con confianza en una aplicación consistente del sistema; sera el autor/donante quien decida si quiere distribuir software mediante cualquier otro sistema y una licencia no puede imponer esa elección. 
+
+Este apartado pretende dejar completamente claro lo que se cree que es una consecuencia del resto de esta Licencia. 
+
+8. Si la distribución y/o el uso del Programa esta restringido en ciertos países, ya sea por patentes o por interfaces bajo copyright, el propietario del Copyright original que pone el Programa bajo esta Licencia debe añadir unos limites geograficos expecíficos excluyendo esos países, por lo que la distribución solo estara permitida en los países no excluidos. En este caso, la Licencia incorpora la limitación de escribir en el cuerpo de esta Licencia. 
+
+9. La Free Software Foundation puede publicar versiones revisadas y/o nuevas de la Licencia GPL de vez en cuando. Dichas versiones seran similares en espíritu a la presente versión, pero pueden ser diferentes en detalles para considerar nuevos problemas o situaciones. 
+
+Cada versión tiene un numero de version propio. Si el Programa especifica un numero de versión de esta Licencia que hace referencia a esta o "cualquier versión posterior", usted tiene la opción de seguir los términos y condiciones de o bien la versión referenciada o bien cualquiera de las versiones posteriores publicadas por la Free Software Foundation. Si el Programa no especifica ningún número de versión, usted debe elegir cualquiera de las versiones publicadas por la Free Software Foundation. 
+
+10. Si usted quiere incorporar parte del Programa en otros programas libres cuyas condiciones de distribucion son diferentes, escriba al autor para pedir permiso. Para el software con el copyrigth bajo la Free Software Foundation, escriba a la Free Software Foundation; algunas veces hacemos excepciones en esto. Nuestra decisión estara guiada por los objetivos de preservar la libertad del software y de los trabajos derivados y el de promocionar el intercambio y reutilización del software en general. 
+
+SIN GARANTIA
+
+11. DADO QUE ESTE PROGRAMA ESTALICENCIADO LIBRE DE COSTE, NO EXISTE GARANTIA PARA EL PROGRAMA, EN TODA LA EXTENSION PERMITIDA POR LA LEY APLICABLE. EXCEPTO CUANDO SE INDIQUE POR ESCRITO, LOS DUENOS DEL COPYRIGHT Y/O OTRAS PARTES PROVEEDORAS FACILITAN EL PROGRAMA "TAL CUAL" SI GARANTIA DE NINGUNA CLASE, NI EXPLICITA NI IMPLICITA, INCLUYENDO, PERO NO LIMITANDO, LAS GARANTIAS APLICABLES MERCANTILES O DE APLICABILIDAD PARA UN PROPOSITO PARTICULAR. USTED ASUME CUALQUIER RIESGO SOBRE LA CALIDAD O LAS PRESTACIONES DEL PROGRAMA. SI EL PROGRAMA TIENE UN ERROR, USTED ASUME EL COSTE DE TODOS LOS SERVICIOS NECESARIOS PARA REPARARLO O CORREGIRLO. 
+
+12. EN NINGUN CASO, EXCEPTO CUANDO SEA REQUERIDO POR LA LEGISLACION APLICABLE O HAYA SIDO ACORDADO POR ESCRITO, NINGUN PROPIETARIO DEL COPYRIGTH NI NINGUNA OTRA PARTE QUE MODIFIQUE Y/O REDISTRIBUYA EL PROGRAMA SEGUN SE PERMITE EN ESTA LICENCIA SERA RESPONSABLE POR DANOS, INCLUYENDO CUALQUIER DANO GENERAL, ESPECIAL ACCIDENTAL O RESULTANTE PRODUCIDO POR EL USO O LA IMPOSIBILIDAD DE USO DEL PROGRAMA (CON INCLUSION PERO SIN LIMITACION DE LA PERDIDA DE DATOS O A LA GENERACION INCORRECTA DE DATOS O A LAS PERDIDAS OCASIONADAS O POR USTED O POR TERCERAS PARTES, O A UN FALLO DEL PROGRAMA AL FUNCIONAR EN COMBINACION CON CUALQUIER OTRO PROGRAMA), INCLUSO SI DICHO PROPIETARIO U OTRA PARTE HA SIDO ADVERTIDO SOBRE LA POSIBILIDAD DE DICHOS DANOS. 
+
+FIN DE TERMINOS Y CONDICIONES
+
+
+<b>GPL version 2 oficial en Ingles</b> - 
+
+GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+END OF TERMS AND CONDITIONS
+
+
+
+
+
+EndOfLicense;
+
+    $lang->install_condition_title = "Por favor chequee los requerimientos de la instalación.";
+
+    $lang->install_checklist_title = array(
+			'php_version' => 'Versión PHP',
+            'permission' => 'Atribución',
+            'xml' => 'Librería XML',
+            'iconv' => 'Librería ICONV',
+            'gd' => 'Librería GD',
+            'session' => 'Configuración Session.auto_start',
+        );
+
+    $lang->install_checklist_desc = array(
+			'php_version' => '[Requerido] Si la versión de PHP es 5.2.2, zeroboard no sera instalado por errores',
+            'permission' => '[Requerido] La ruta de la instalación de Zeroboard o el directorio de ./archivos deberia tener la atribución 707',
+            'xml' => '[Requerido] Libreria XML es necesario para la comunicación de XML',
+            'session' => '[Requerido] Para el uso de la sesion de Zeroboard, el archivo php.ini deberia estar configurada  session.auto_start=0',
+            'iconv' => 'Para transformar UTF-8 y otra paquete del idioma deberia estar instalado el Iconv.',
+            'gd' => 'Libreria GD deberia estar instalado para utilizar la funcion de convertir la imagen',
+        );
+
+    $lang->install_checklist_xml = 'Instalar Librería XML ';
+    $lang->install_without_xml = 'Librería XML no esta instalado';
+    $lang->install_checklist_gd = 'Instalar Librería GD';
+    $lang->install_without_gd  = 'Libreria GD no esta instalado para la conversión de la imagen';
+    $lang->install_checklist_gd = 'Intalar Librería GD';
+    $lang->install_without_iconv = 'Libreria Iconv no esta instalado para procesar las fuentes';
+    $lang->install_session_auto_start = 'Puede provocar errores si en la configuración de php esta configurada "session.auto_start=1"';
+    $lang->install_permission_denied = 'La atribución de la ruta de instalacion no es igual a 707';
+
+    $lang->cmd_agree_license = 'Yo accepto la licencia';
+    $lang->cmd_install_fix_checklist = 'Yo he configurado las condiciones necesarias para la instalación.';
+    $lang->cmd_install_next = 'Continuar la instalación';
+
+    $lang->db_desc = array(
+        'mysql' => 'Utilizando las funciones mysql*() de PHP usar DB mysql.<br />La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.',
+        'mysql_innodb' => 'Utilizando innodb usar BD mysql.<br />La transacción es hablilitado para innodb',
+        'sqlite2' => 'Soporta sqlite2, el cual almacena los datos en archivos <br />En la instalacion, es necesario crear archivo de BD en un lugar inaccesible de la web.<br />(Testeo de la estabilización no realizada)',
+        'sqlite3_pdo' => 'A través de PDO de PHP soporta sqlite2 <br />En la instalación, es necesario crear archivo de BD en un lugar inaccesible de la web.',
+        'cubrid' => 'Usar BD CUBRID.',
+        'postgresql' => 'Usar BD PostgreSql.',
+        'firebird' => 'Usar BD firebird.',
+    );
+
+    $lang->form_title = 'Ingresar  BD &amp; Información del Administrador;';
+    $lang->db_title = 'Por favor escribir información de BD';
+    $lang->db_type = 'Tipo de BD';
+    $lang->select_db_type = 'Seleccione el tipo de BD que desea usar.';
+    $lang->db_hostname = 'Hostname de BD';
+    $lang->db_port = 'Port de BD';
+    $lang->db_userid = 'ID de BD';
+    $lang->db_password = 'Contraseña de BD';
+    $lang->db_database = 'Base de datos BD';
+    $lang->db_database_file = 'Archivo de base de datos BD';
+    $lang->db_table_prefix = 'Encabezado de la tabla';
+
+    $lang->admin_title = 'Información del Administrator';
+
+    $lang->env_title = 'Configuración';
+    $lang->use_optimizer = 'Habilitar el optimizador';
+    $lang->about_optimizer = 'Si optimizador está habilitado, los usuarios pueden acceder rápidamente a este sitio, ya que hay múltiples CSS / JS archivos son comprimidos juntos y antes de la transmisión. <br /> No obstante, esta optimización podría ser problemáticas de acuerdo con CSS o JS. Si inhabilitarlo, que funciona correctamente a pesar de que sería más lento el trabajo.';
+    $lang->use_rewrite = 'Usar rewrite mod';
+    $lang->about_rewrite = "Si el servidor de la web soporte rewrite mod, URL largas como http://bla/?documento_srl=123 puede abreviarse como  http://bla/123";
+    $lang->time_zone = 'La Hora por Zona';
+    $lang->about_time_zone = "Si la hora del servidor y la hora de su ubicación es diferente, Usted puede elegir la hora por zona para corregir";
     $lang->qmail_compatibility = 'Qmail 호환';
     $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
-
-    $lang->about_database_file = 'Sqlite guarda el dato en el archivo. Es necesario crear archivo de BD en un lugar inaccesible de la web.<br/><span style="color:red">El archivo de dato debe estar ubicado en un lugar con la atribución 707.</span>';
-
-    $lang->success_installed = 'Instalación finalizada';
-    $lang->success_updated = 'Actualización finalizada';
-
-    $lang->msg_cannot_proc = 'No puede ser ejecutado lo requerido por no disponer del ambiente de instalación.';
-    $lang->msg_already_installed = 'Instalación de Zeroboard ya existe.';
-    $lang->msg_dbconnect_failed = "Ha ocurrido un error en la conección de BD.\n Por favor chequee la información de BD nuevamente";
-    $lang->msg_table_is_exists = "La tabla ya ha sido creado en BD.\n Creado nuevamente el archivo de configuración.";
-    $lang->msg_install_completed = "Instalación finalizada.\n Muchas gracias.";
-    $lang->msg_install_failed = "Ha ocurrido un error al crear el archivo de instalación.";
-?>
+
+    $lang->about_database_file = 'Sqlite guarda el dato en el archivo. Es necesario crear archivo de BD en un lugar inaccesible de la web.<br/><span style="color:red">El archivo de dato debe estar ubicado en un lugar con la atribución 707.</span>';
+
+    $lang->success_installed = 'Instalación finalizada';
+    $lang->success_updated = 'Actualización finalizada';
+
+    $lang->msg_cannot_proc = 'No puede ser ejecutado lo requerido por no disponer del ambiente de instalación.';
+    $lang->msg_already_installed = 'Instalación de Zeroboard ya existe.';
+    $lang->msg_dbconnect_failed = "Ha ocurrido un error en la conección de BD.\n Por favor chequee la información de BD nuevamente";
+    $lang->msg_table_is_exists = "La tabla ya ha sido creado en BD.\n Creado nuevamente el archivo de configuración.";
+    $lang->msg_install_completed = "Instalación finalizada.\n Muchas gracias.";
+    $lang->msg_install_failed = "Ha ocurrido un error al crear el archivo de instalación.";
+?>
diff --git a/modules/install/lang/fr.lang.php b/modules/install/lang/fr.lang.php
index 45cdefc75..ed24c4448 100644
--- a/modules/install/lang/fr.lang.php
+++ b/modules/install/lang/fr.lang.php
@@ -200,6 +200,7 @@ EndOfLicense;
         'sqlite3_pdo' => 'Supporter sqlite3 PDO de PHP.<br />Quand vous installez, vous devez cr?r le fichier de DB dans une place que l\'on ne peut pas accéder par web.',
         'cubrid' => 'Utiliser CUBRID DB.',
         'postgresql' => 'Utiliser PostgreSql DB.',
+        'firebird' => 'Utiliser firebird DB.',
     );
 
     $lang->form_title = 'Entrer des informations de  DB(Base de données) et Administrateur';
diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
index a75ee0c58..5d78ddab6 100644
--- a/modules/install/lang/jp.lang.php
+++ b/modules/install/lang/jp.lang.php
@@ -239,6 +239,7 @@ EndOfLicense;
         'sqlite3_pdo' => 'PHPのPDOを経由うして「sqlite3」をサポートします。<br />インストールの際は、DBファイルはウェブからアクセスできない場所に生成してください。',
         'cubrid' => 'CUBRID DBを利用します。',
         'postgresql' => 'PostgreSql DBを利用します。',
+        'firebird' => 'Firebird DBを利用します。',
     );
 
     $lang->form_title = 'データベース &amp; 管理者情報入力';
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
index aac09211c..3bf3b3b44 100644
--- a/modules/install/lang/ko.lang.php
+++ b/modules/install/lang/ko.lang.php
@@ -238,6 +238,7 @@ EndOfLicense;
         'sqlite3_pdo' => 'PHP의 PDO로 sqlite3를 지원합니다.<br />설치시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.',
         'cubrid' => 'CUBRID DB를 이용합니다.',
         'postgresql' => 'PostgreSql을 이용합니다',
+        'firebird' => 'Firebird를 이용합니다',
     );
 
     $lang->form_title = 'DB &amp; 관리자 정보 입력';
diff --git a/modules/install/lang/ru.lang.php b/modules/install/lang/ru.lang.php
index 1fb4695d8..c4ca4ccde 100644
--- a/modules/install/lang/ru.lang.php
+++ b/modules/install/lang/ru.lang.php
@@ -330,6 +330,7 @@ EndOfLicense;
         'sqlite3_pdo' => 'Поддерживает sqlite3 посредством PHP\'s PDO.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.',
         'cubrid' => 'Используем CUBRID DB.',
         'postgresql' => 'Используем PostgreSql DB.',
+        'firebird' => 'Используем firebird DB.',
     );
 
     $lang->form_title = 'Пожалуйста, введите дазу данных &amp; Административная Информация';
diff --git a/modules/install/lang/zh-CN.lang.php b/modules/install/lang/zh-CN.lang.php
index 6905d9b62..2da8a8bdc 100644
--- a/modules/install/lang/zh-CN.lang.php
+++ b/modules/install/lang/zh-CN.lang.php
@@ -1,271 +1,272 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author zero (zero@nzeo.com)
-     * @brief  中文语言包 （只收录了基本内容）
-     **/
-
-    $lang->introduce_title = '安装 Zeroboard XE';
-    $lang->license = <<<EndOfLicense
-- 程序名称 : zeroboard XE (zeroboardXE)
-- 版权信息   : GNU GENERAL PUBLIC LICENSE
-- 官方网址 : <a href="http://www.zeroboard.com">http://www.zeroboard.com</a>
-- 原作者 : zero (zero@zeroboard.com, http://www.zeroboard.com)
-
-zeroboard xe遵循 通用公共许可证(GNU General Public License) 开发，任何人都可以永久免费安装使用。
-
-<b>gnu通用公共许可证</b> -  翻译文
-1991．6第二版
-
-版权所有(c)1989，1991 free software foundation, inc．
-
-675 mass ave， cambridge,mao2139， usa
-
-允许每个人复制和发布这一许可证原始文档的副本，但绝对不允许对它进行任何修改。
-
-序言
-
-大多数软件许可证决意剥夺你的共享和修改软件的自由。对比之下，gnu通用公共许可证力图保证你的共享和修改自由软件的自由--保证自由软件对所有用户是自由的。gpl适用于大多数自由软件基金会的软件，以及由使用这些软件而承担义务的作者所开发的软件。(自由软件基金会的其他一些软件受 gnu库通用许可证的保护)。你也可以将它用到你的程序中。
-
-当我们谈到自由软件(free software)时，我们指的是自由而不是价格。我们的 gnu通用公共许可证决意保证你有发布自由软件的自由(如果你愿意，你可以对此项服务收取一定的费用)；保证你能收到源程序或者在你需要时能得到它；保证你能修改软件或将它的一部分用于新的自由软件；而且还保证你知道你能做这些事情。
-
-为了保护你的权利，我们需要作出规定：禁止任何人不承认你的权利，或者要求你放弃这些权利。如果你修改了自由软件或者发布了软件的副本，这些规定就转化为你的责任。例如，如果你发布这样一个程序的副本，不管是收费的还是免费的，你必须将你具有的一切权利给予你的接受者；你必须保证他们能收到或得到源程序；并且将这些条款给他们看，使他们知道他们有这样的权利。
-
-我们采取两项措施来保护你的权利。
-
-(1)给软件以版权保护。
-
-(2) 给你提供许可证。它给你复制，发布和修改这些软件的法律许可。同样，为了保护每个作者和我们自己，我们需要清楚地让每个人明白，自由软件没有担保(no warranty)。如果由于其他某个人修改了软件，并继续加以传播。我们需要它的接受者明白：他们所得到的并不是原来的自由软件。由其他人引人的任何问题，不应损害原作者的声誉。最后，任何自由软件不断受到软件专利的威胁。我们希望避免这样的风险，自由软件的再发布者以个人名义获得专利许可证。事实上，将软件变为私有。为防止这一点，我们必须明确：任何专利必须以允许每个人自由使用为前提，否则就不准许有专利。
-
-有关复制，发布和修改的条款和条件
-
-0．此许可证适用于任何包含版权所有者声明的程序和其他作品，版权所有者在声明中明确说明程序和作品可以在gpi条款的约束下发布。下面提到的"程序"指的是任何这样的程序或作品。而"基于程序的作品"指的是程序或者任何受版权法约束的衍生作品。也就是说包含程序或程序的一部分的作品。可以是原封不动的，或经过修改的和／或翻译成其他语言的(程序)。在下文中，翻译包含在修改的条款久每个许可证接受人(iicense)用你来称呼。许可证条款不适用于复制，发布和修改以外的活动。这些活动超出这些条款的范围。运行程序的活动不受条款的限止。仅当程序的输出构成基于程序作品的内容时，这一条款才适用(如果只运行程序就无关)。是否普遍适用取决于程序具体用来做什么。
-
-1．只要你在每一副本上明显和恰当地出版版权声明和不承担担保的声明，保持此许可证的声明和没有担保的声明完整无损，并和程序一起给每个其他的程序接受者一份许可证的副本，你就可以用任何媒体复制和发布你收到的原始的程序的源代码。你可以为转让副本的实际行动收取一定费用。你也有权选择提供担保以换取一定费用。
-
-2．你可以修改程序的一个或几个副本或程序的任何部分，以此形成基于程序的作品。只要你同时满足下面的所有条件，你就可以按前面第一款的要求复制和发布这一经过修改的程序或作品。
-
-a)你必须在修改的文件中附有明确的说明：你修改了这一文件及具体的修改日期。
-
-b)你必须使你发布或出版的作品(它包含程序的全部或一部分，或包含由程序的全部或部分衍生的作品)允许第三方作为整体按许可证条款免费使用。
-
-c)如果修改的程序在运行时以交互方式读取命令，你必须使它在开始进入常规的交互使用方式时打印或显示声明：包括适当的版权声明和没有担保的声明(或者你提供担保的声明)；用户可以按此许可证条款重新发布程序的说明；并告诉用户如何看到这一许可证的副本。(例外的情况：如果原始程序以交互方式工作，它并不打印这样的声明，你的基于程序的作品也就不用打印声明)。
-
-这些要求适用于修改了的作品的整体。如果能够确定作品的一部分并非程序的衍生产品，可以合理地认为这部分是独立的，是不同的作品。当你将它作为独立作品发布时，它不受此许可证和它的条款的约束。但是当你将这部分作为基于程序的作品的一部分发布时，作为整体它将受到许可证条款约束。准予其他许可证持有人的使用范围扩大到整个产品。也就是每个部分，不管它是谁写的。因此，本条款的意图不在于索取权利；或剥夺全部由你写成的作品的权利。而是履行权利来控制基于程序的集体作品或衍生作品的发布。
-
-此外，将与程序无关的作品和该程序或基于程序的作品一起放在存贮体或发布媒体的同一卷上，并不导致将其他作品置于此许可证的约束范围之内。
-
-3．你可以以目标码或可执行形式复制或发布程序(或符合第2款的基于程序的作品)，只要你遵守前面的第 l，2款，并同时满足下列3条中的1条。
-
-a)在通常用作软件交换的媒体上，和目标码一起附有机器可读的完整的源码。这些源码的发布应符合上面第1，2款的要求。或者
-
-b)在通常用作软件交换的媒体上，和目标码一起，附有给第三方提供相应的机器可读的源码的书面报价。有效期不少于3年，费用不超过实际完成源程序发布的实际成本。源码的发布应符合上面的第1，2款的要求。或者
-
-c)和目标码一起，附有你收到的发布源码的报价信息。(这一条款只适用于非商业性发布，而且你只收到程序的目标码或可执行代码和按 b)款要求提供的报价)。
-
-作品的源码指的是对作品进行修改最优先择取的形式。对可执行的作品讲，完整的源码包括：所有模块的所有源程序，加上有关的接口的定义，加上控制可执行作品的安装和编译的 script。作为特殊例外，发布的源码不必包含任何常规发布的供可执行代码在上面运行的操作系统的主要组成部分(如编译程序，内核等)。除非这些组成部分和可执行作品结合在一起。
-
-如果采用提供对指定地点的访问和复制的方式发布可执行码或目标码，那么，提供对同一地点的访问和复制源码可以算作源码的发布，即使第三方不强求与目标码一起复制源码。
-
-4．除非你明确按许可证提出的要求去做，否则你不能复制，修改，转发许可证和发布程序。任何试图用其他方式复制，修改，转发许可证和发布程序是无效的。而且将自动结束许可证赋予你的权利。然而，对那些从你那里按许可证条款得到副本和权利的人们，只要他们继续全面履行条款，许可证赋予他们的权利仍然有效。
-
-5．你没有在许可证上签字，因而你没有必要一定接受这一许可证。然而，没有任何其他东西赋予你修改和发布程序及其衍生作品的权利。如果你不接受许可证，这些行为是法律禁止的。因此，如果你修改或发布程序(或任何基于程序的作品)，你就表明你接受这一许可证以及它的所有有关复制，发布和修改程序或基于程序的作品的条款和条件。
-
-6．每当你重新发布程序(或任何基于程序的作品)时，接受者自动从原始许可证颁发者那里接到受这些条款和条件支配的复制，发布或修改程序的许可证。你不可以对接受者履行这里赋予他们的权利强加其他限制。你也没有强求第三方履行许可证条款的义务。
-
-7．如果由于法院判决或违反专利的指控或任何其他原因(不限于专利问题)的结果，强加于你的条件(不管是法院判决，协议或其他)和许可证的条件有冲突。他们也不能用许可证条款为你开脱。在你不能同时满足本许可证规定的义务及其他相关的义务时，作为结果，你可以根本不发布程序。例如，如果某一专利许可证不允许所有那些直接或间接从你那里接受副本的人们在不付专利费的情况下重新发布程序，唯一能同时满足两方面要求的办法是停止发布程序。
-
-如果本条款的任何部分在特定的环境下无效或无法实施，就使用条款的其余部分。并将条款作为整体用于其他环境。
-
-本条款的目的不在于引诱你侵犯专利或其他财产权的要求，或争论这种要求的有效性。本条款的主要目的在于保护自由软件发布系统的完整性。它是通过通用公共许可证的应用来实现的。许多人坚持应用这一系统，已经为通过这一系统发布大量自由软件作出慷慨的供献。作者／捐献者有权决定他／她是否通过任何其他系统发布软件。许可证待有人不能强制这种选择。
-
-本节的目的在于明确说明许可证其余部分可能产生的结果。
-
-8．如果由于专利或者由于有版权的接口问题使程序在某些国家的发布和使用受到限止，将此程序置于许可证约束下的原始版权拥有者可以增加限止发布地区的条款，将这些国家明确排除在外。并在这些国家以外的地区发布程序。在这种情况下，许可证包含的限止条款和许可证正文一样有效。
-
-9．自由软件基金会可能随时出版通用公共许可证的修改版或新版。新版和当前的版本在原则上保持一致，但在提到新问题时或有关事项时，在细节上可能出现差别。
-
-每一版本都有不同的版本号。如果程序指定适用于它的许可证版本号以及"任何更新的版本"。你有权选择遵循指定的版本或自由软件基金会以后出版的新版本，如果程序未指定许可证版本，你可选择自由软件基金会已经出版的任何版本。
-
-10．如果你愿意将程序的一部分结合到其他自由程序中，而它们的发布条件不同。写信给作者，要求准予使用。如果是自由软件基金会加以版权保护的软件，写信给自由软件基金会。我们有时会作为例外的情况处理。我们的决定受两个主要目标的指导。这两个主要目标是：我们的自由软件的衍生作品继续保持自由状态。以及从整体上促进软件的共享和重复利用。
-
-没有担保
-
-11．由于程序准予免费使用，在适用法准许的范围内，对程序没有担保。除非另有书面说明，版权所有者和／或其他提供程序的人们"一样"不提供任何类型的担保。不论是明确的，还是隐含的。包括但不限于隐含的适销和适合特定用途的保证。全部的风险，如程序的质量和性能问题都由你来承担。如果程序出现缺陷，你承担所有必要的服务，修复和改正的费用。
-
-12．除非适用法或书面协议的要求，在任何情况下，任何版权所有者或任何按许可证条款修改和发布程序的人们都不对你的损失负有任何责任。包括由于使用或不能使用程序引起的任何一般的，特殊的，偶然发生的或重大的损失(包括但不限于数据的损失，或者数据变得不精确，或者你或第三方的持续的损失，或者程序不能和其他程序协调运行等)。即使版权所有者和其他人提到这种损失的可能性也不例外。
-
-条款和条件结束
-
-
-<b>gnu通用公共许可证</b> - 原文
-
-GNU GENERAL PUBLIC LICENSE
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
-b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
-c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
-
-
-
-
-
-EndOfLicense;
-
-    $lang->install_condition_title = "确认安装所需环境。";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'PHP版本',
-            'permission' => '属性',
-            'xml' => 'XML库',
-            'iconv' => 'ICONV库',
-            'gd' => 'GD库',
-            'session' => 'Session.auto_start 设置',
-        );
-
-    $lang->install_checklist_desc = array(
-	    'php_version' => '[必须] 由于 PHP 5.2.2 版本BUG，无法安装zeroboard XE。',
-            'permission' => '[必须] zeroboard的安装路径或 ./files目录属性必须是707',
-            'xml' => '[必须]为了 XML通讯，将需要XML库',
-            'session' => '[必须] 为了使用缓冲功能，必须在php.ini当中设置 session.auto_start=0',
-            'iconv' => '为了UTF-8和其他语言环境之间的互相转换，必须安装iconv',
-            'gd' => '为了使用图片转换功能，必须先得安装GD库',
-        );
-
-    $lang->install_checklist_xml = '安装XML库';
-    $lang->install_without_xml = '还没有安装xml库！';
-    $lang->install_checklist_gd = '安装GD库';
-    $lang->install_without_gd  = '还没有安装负责转换图片功能的GD库！';
-    $lang->install_checklist_gd = '安装GD库';
-    $lang->install_without_iconv = '还没有安装负责处理字串的iconv库！';
-    $lang->install_session_auto_start = 'PHP设置中设置成session.auto_start==1，可能处理session时发生错误。';
-    $lang->install_permission_denied = '安装目录属性不是707！';
-
-    $lang->cmd_agree_license = '同意条款';
-    $lang->cmd_install_fix_checklist = '已设置了必要的安装条件。';
-    $lang->cmd_install_next = '开始进行安装';
-
-    $lang->db_desc = array(
-        'mysql' => '利用php的 mysql*()函数使用mysql DB。<br />DB数据是以myisam生成，因此不能实现transaction。',
-        'mysql_innodb' => '利用innodb使用mysql DB。<br />innodb可以使用transaction。',
-        'sqlite2' => '支持用文件形式保存数据的sqlite2。<br />安装时DB文件应在web不能访问的地方生成。<br />(还没有通过安全的测试)',
-        'sqlite3_pdo' => '用PHP的 PDO支持 sqlite3。<br />安装时DB文件应在web不能访问的地方生成。',
-        'cubrid' => '使用CUBRID DB。',
-        'postgresql' => '使用PostgreSql DB。',
-    );
-
-    $lang->form_title = '输入数据库及管理员信息';
-    $lang->db_title = '输入数据库信息';
-    $lang->db_type = '数据库类型';
-    $lang->select_db_type = '请选择要使用的数据库。';
-    $lang->db_hostname = '服务器名';
-    $lang->db_port = '数据库端口';
-    $lang->db_userid = '用户名';
-    $lang->db_password = '密码';
-    $lang->db_database = '数据库名';
-    $lang->db_database_file = '数据库文件';
-    $lang->db_table_prefix = '前缀';
-
-    $lang->admin_title = '管理员信息';
-
-    $lang->env_title = '环境设置';
-    $lang->use_optimizer = '使用Optimizer';
-    $lang->about_optimizer = '使用Optimizer可以对大部分的CSS/ JS文件进行整合/压缩传送使之加快网站访问速度。<br />只是有时会发生小小的问题。这时候请暂时不要使用Optimizer。';
-    $lang->use_rewrite = '使用rewrite模块';
-    $lang->about_rewrite = '如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。';
-    $lang->time_zone = '时区';
+<?php
+    /**
+     * @file   zh-CN.lang.php
+     * @author zero (zero@nzeo.com)
+     * @brief  中文语言包 （只收录了基本内容）
+     **/
+
+    $lang->introduce_title = '安装 Zeroboard XE';
+    $lang->license = <<<EndOfLicense
+- 程序名称 : zeroboard XE (zeroboardXE)
+- 版权信息   : GNU GENERAL PUBLIC LICENSE
+- 官方网址 : <a href="http://www.zeroboard.com">http://www.zeroboard.com</a>
+- 原作者 : zero (zero@zeroboard.com, http://www.zeroboard.com)
+
+zeroboard xe遵循 通用公共许可证(GNU General Public License) 开发，任何人都可以永久免费安装使用。
+
+<b>gnu通用公共许可证</b> -  翻译文
+1991．6第二版
+
+版权所有(c)1989，1991 free software foundation, inc．
+
+675 mass ave， cambridge,mao2139， usa
+
+允许每个人复制和发布这一许可证原始文档的副本，但绝对不允许对它进行任何修改。
+
+序言
+
+大多数软件许可证决意剥夺你的共享和修改软件的自由。对比之下，gnu通用公共许可证力图保证你的共享和修改自由软件的自由--保证自由软件对所有用户是自由的。gpl适用于大多数自由软件基金会的软件，以及由使用这些软件而承担义务的作者所开发的软件。(自由软件基金会的其他一些软件受 gnu库通用许可证的保护)。你也可以将它用到你的程序中。
+
+当我们谈到自由软件(free software)时，我们指的是自由而不是价格。我们的 gnu通用公共许可证决意保证你有发布自由软件的自由(如果你愿意，你可以对此项服务收取一定的费用)；保证你能收到源程序或者在你需要时能得到它；保证你能修改软件或将它的一部分用于新的自由软件；而且还保证你知道你能做这些事情。
+
+为了保护你的权利，我们需要作出规定：禁止任何人不承认你的权利，或者要求你放弃这些权利。如果你修改了自由软件或者发布了软件的副本，这些规定就转化为你的责任。例如，如果你发布这样一个程序的副本，不管是收费的还是免费的，你必须将你具有的一切权利给予你的接受者；你必须保证他们能收到或得到源程序；并且将这些条款给他们看，使他们知道他们有这样的权利。
+
+我们采取两项措施来保护你的权利。
+
+(1)给软件以版权保护。
+
+(2) 给你提供许可证。它给你复制，发布和修改这些软件的法律许可。同样，为了保护每个作者和我们自己，我们需要清楚地让每个人明白，自由软件没有担保(no warranty)。如果由于其他某个人修改了软件，并继续加以传播。我们需要它的接受者明白：他们所得到的并不是原来的自由软件。由其他人引人的任何问题，不应损害原作者的声誉。最后，任何自由软件不断受到软件专利的威胁。我们希望避免这样的风险，自由软件的再发布者以个人名义获得专利许可证。事实上，将软件变为私有。为防止这一点，我们必须明确：任何专利必须以允许每个人自由使用为前提，否则就不准许有专利。
+
+有关复制，发布和修改的条款和条件
+
+0．此许可证适用于任何包含版权所有者声明的程序和其他作品，版权所有者在声明中明确说明程序和作品可以在gpi条款的约束下发布。下面提到的"程序"指的是任何这样的程序或作品。而"基于程序的作品"指的是程序或者任何受版权法约束的衍生作品。也就是说包含程序或程序的一部分的作品。可以是原封不动的，或经过修改的和／或翻译成其他语言的(程序)。在下文中，翻译包含在修改的条款久每个许可证接受人(iicense)用你来称呼。许可证条款不适用于复制，发布和修改以外的活动。这些活动超出这些条款的范围。运行程序的活动不受条款的限止。仅当程序的输出构成基于程序作品的内容时，这一条款才适用(如果只运行程序就无关)。是否普遍适用取决于程序具体用来做什么。
+
+1．只要你在每一副本上明显和恰当地出版版权声明和不承担担保的声明，保持此许可证的声明和没有担保的声明完整无损，并和程序一起给每个其他的程序接受者一份许可证的副本，你就可以用任何媒体复制和发布你收到的原始的程序的源代码。你可以为转让副本的实际行动收取一定费用。你也有权选择提供担保以换取一定费用。
+
+2．你可以修改程序的一个或几个副本或程序的任何部分，以此形成基于程序的作品。只要你同时满足下面的所有条件，你就可以按前面第一款的要求复制和发布这一经过修改的程序或作品。
+
+a)你必须在修改的文件中附有明确的说明：你修改了这一文件及具体的修改日期。
+
+b)你必须使你发布或出版的作品(它包含程序的全部或一部分，或包含由程序的全部或部分衍生的作品)允许第三方作为整体按许可证条款免费使用。
+
+c)如果修改的程序在运行时以交互方式读取命令，你必须使它在开始进入常规的交互使用方式时打印或显示声明：包括适当的版权声明和没有担保的声明(或者你提供担保的声明)；用户可以按此许可证条款重新发布程序的说明；并告诉用户如何看到这一许可证的副本。(例外的情况：如果原始程序以交互方式工作，它并不打印这样的声明，你的基于程序的作品也就不用打印声明)。
+
+这些要求适用于修改了的作品的整体。如果能够确定作品的一部分并非程序的衍生产品，可以合理地认为这部分是独立的，是不同的作品。当你将它作为独立作品发布时，它不受此许可证和它的条款的约束。但是当你将这部分作为基于程序的作品的一部分发布时，作为整体它将受到许可证条款约束。准予其他许可证持有人的使用范围扩大到整个产品。也就是每个部分，不管它是谁写的。因此，本条款的意图不在于索取权利；或剥夺全部由你写成的作品的权利。而是履行权利来控制基于程序的集体作品或衍生作品的发布。
+
+此外，将与程序无关的作品和该程序或基于程序的作品一起放在存贮体或发布媒体的同一卷上，并不导致将其他作品置于此许可证的约束范围之内。
+
+3．你可以以目标码或可执行形式复制或发布程序(或符合第2款的基于程序的作品)，只要你遵守前面的第 l，2款，并同时满足下列3条中的1条。
+
+a)在通常用作软件交换的媒体上，和目标码一起附有机器可读的完整的源码。这些源码的发布应符合上面第1，2款的要求。或者
+
+b)在通常用作软件交换的媒体上，和目标码一起，附有给第三方提供相应的机器可读的源码的书面报价。有效期不少于3年，费用不超过实际完成源程序发布的实际成本。源码的发布应符合上面的第1，2款的要求。或者
+
+c)和目标码一起，附有你收到的发布源码的报价信息。(这一条款只适用于非商业性发布，而且你只收到程序的目标码或可执行代码和按 b)款要求提供的报价)。
+
+作品的源码指的是对作品进行修改最优先择取的形式。对可执行的作品讲，完整的源码包括：所有模块的所有源程序，加上有关的接口的定义，加上控制可执行作品的安装和编译的 script。作为特殊例外，发布的源码不必包含任何常规发布的供可执行代码在上面运行的操作系统的主要组成部分(如编译程序，内核等)。除非这些组成部分和可执行作品结合在一起。
+
+如果采用提供对指定地点的访问和复制的方式发布可执行码或目标码，那么，提供对同一地点的访问和复制源码可以算作源码的发布，即使第三方不强求与目标码一起复制源码。
+
+4．除非你明确按许可证提出的要求去做，否则你不能复制，修改，转发许可证和发布程序。任何试图用其他方式复制，修改，转发许可证和发布程序是无效的。而且将自动结束许可证赋予你的权利。然而，对那些从你那里按许可证条款得到副本和权利的人们，只要他们继续全面履行条款，许可证赋予他们的权利仍然有效。
+
+5．你没有在许可证上签字，因而你没有必要一定接受这一许可证。然而，没有任何其他东西赋予你修改和发布程序及其衍生作品的权利。如果你不接受许可证，这些行为是法律禁止的。因此，如果你修改或发布程序(或任何基于程序的作品)，你就表明你接受这一许可证以及它的所有有关复制，发布和修改程序或基于程序的作品的条款和条件。
+
+6．每当你重新发布程序(或任何基于程序的作品)时，接受者自动从原始许可证颁发者那里接到受这些条款和条件支配的复制，发布或修改程序的许可证。你不可以对接受者履行这里赋予他们的权利强加其他限制。你也没有强求第三方履行许可证条款的义务。
+
+7．如果由于法院判决或违反专利的指控或任何其他原因(不限于专利问题)的结果，强加于你的条件(不管是法院判决，协议或其他)和许可证的条件有冲突。他们也不能用许可证条款为你开脱。在你不能同时满足本许可证规定的义务及其他相关的义务时，作为结果，你可以根本不发布程序。例如，如果某一专利许可证不允许所有那些直接或间接从你那里接受副本的人们在不付专利费的情况下重新发布程序，唯一能同时满足两方面要求的办法是停止发布程序。
+
+如果本条款的任何部分在特定的环境下无效或无法实施，就使用条款的其余部分。并将条款作为整体用于其他环境。
+
+本条款的目的不在于引诱你侵犯专利或其他财产权的要求，或争论这种要求的有效性。本条款的主要目的在于保护自由软件发布系统的完整性。它是通过通用公共许可证的应用来实现的。许多人坚持应用这一系统，已经为通过这一系统发布大量自由软件作出慷慨的供献。作者／捐献者有权决定他／她是否通过任何其他系统发布软件。许可证待有人不能强制这种选择。
+
+本节的目的在于明确说明许可证其余部分可能产生的结果。
+
+8．如果由于专利或者由于有版权的接口问题使程序在某些国家的发布和使用受到限止，将此程序置于许可证约束下的原始版权拥有者可以增加限止发布地区的条款，将这些国家明确排除在外。并在这些国家以外的地区发布程序。在这种情况下，许可证包含的限止条款和许可证正文一样有效。
+
+9．自由软件基金会可能随时出版通用公共许可证的修改版或新版。新版和当前的版本在原则上保持一致，但在提到新问题时或有关事项时，在细节上可能出现差别。
+
+每一版本都有不同的版本号。如果程序指定适用于它的许可证版本号以及"任何更新的版本"。你有权选择遵循指定的版本或自由软件基金会以后出版的新版本，如果程序未指定许可证版本，你可选择自由软件基金会已经出版的任何版本。
+
+10．如果你愿意将程序的一部分结合到其他自由程序中，而它们的发布条件不同。写信给作者，要求准予使用。如果是自由软件基金会加以版权保护的软件，写信给自由软件基金会。我们有时会作为例外的情况处理。我们的决定受两个主要目标的指导。这两个主要目标是：我们的自由软件的衍生作品继续保持自由状态。以及从整体上促进软件的共享和重复利用。
+
+没有担保
+
+11．由于程序准予免费使用，在适用法准许的范围内，对程序没有担保。除非另有书面说明，版权所有者和／或其他提供程序的人们"一样"不提供任何类型的担保。不论是明确的，还是隐含的。包括但不限于隐含的适销和适合特定用途的保证。全部的风险，如程序的质量和性能问题都由你来承担。如果程序出现缺陷，你承担所有必要的服务，修复和改正的费用。
+
+12．除非适用法或书面协议的要求，在任何情况下，任何版权所有者或任何按许可证条款修改和发布程序的人们都不对你的损失负有任何责任。包括由于使用或不能使用程序引起的任何一般的，特殊的，偶然发生的或重大的损失(包括但不限于数据的损失，或者数据变得不精确，或者你或第三方的持续的损失，或者程序不能和其他程序协调运行等)。即使版权所有者和其他人提到这种损失的可能性也不例外。
+
+条款和条件结束
+
+
+<b>gnu通用公共许可证</b> - 原文
+
+GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+END OF TERMS AND CONDITIONS
+
+
+
+
+
+EndOfLicense;
+
+    $lang->install_condition_title = "确认安装所需环境。";
+
+    $lang->install_checklist_title = array(
+			'php_version' => 'PHP版本',
+            'permission' => '属性',
+            'xml' => 'XML库',
+            'iconv' => 'ICONV库',
+            'gd' => 'GD库',
+            'session' => 'Session.auto_start 设置',
+        );
+
+    $lang->install_checklist_desc = array(
+	    'php_version' => '[必须] 由于 PHP 5.2.2 版本BUG，无法安装zeroboard XE。',
+            'permission' => '[必须] zeroboard的安装路径或 ./files目录属性必须是707',
+            'xml' => '[必须]为了 XML通讯，将需要XML库',
+            'session' => '[必须] 为了使用缓冲功能，必须在php.ini当中设置 session.auto_start=0',
+            'iconv' => '为了UTF-8和其他语言环境之间的互相转换，必须安装iconv',
+            'gd' => '为了使用图片转换功能，必须先得安装GD库',
+        );
+
+    $lang->install_checklist_xml = '安装XML库';
+    $lang->install_without_xml = '还没有安装xml库！';
+    $lang->install_checklist_gd = '安装GD库';
+    $lang->install_without_gd  = '还没有安装负责转换图片功能的GD库！';
+    $lang->install_checklist_gd = '安装GD库';
+    $lang->install_without_iconv = '还没有安装负责处理字串的iconv库！';
+    $lang->install_session_auto_start = 'PHP设置中设置成session.auto_start==1，可能处理session时发生错误。';
+    $lang->install_permission_denied = '安装目录属性不是707！';
+
+    $lang->cmd_agree_license = '同意条款';
+    $lang->cmd_install_fix_checklist = '已设置了必要的安装条件。';
+    $lang->cmd_install_next = '开始进行安装';
+
+    $lang->db_desc = array(
+        'mysql' => '利用php的 mysql*()函数使用mysql DB。<br />DB数据是以myisam生成，因此不能实现transaction。',
+        'mysql_innodb' => '利用innodb使用mysql DB。<br />innodb可以使用transaction。',
+        'sqlite2' => '支持用文件形式保存数据的sqlite2。<br />安装时DB文件应在web不能访问的地方生成。<br />(还没有通过安全的测试)',
+        'sqlite3_pdo' => '用PHP的 PDO支持 sqlite3。<br />安装时DB文件应在web不能访问的地方生成。',
+        'cubrid' => '使用CUBRID DB。',
+        'postgresql' => '使用PostgreSql DB。',
+        'firebird' => '使用Firebird DB。',
+    );
+
+    $lang->form_title = '输入数据库及管理员信息';
+    $lang->db_title = '输入数据库信息';
+    $lang->db_type = '数据库类型';
+    $lang->select_db_type = '请选择要使用的数据库。';
+    $lang->db_hostname = '服务器名';
+    $lang->db_port = '数据库端口';
+    $lang->db_userid = '用户名';
+    $lang->db_password = '密码';
+    $lang->db_database = '数据库名';
+    $lang->db_database_file = '数据库文件';
+    $lang->db_table_prefix = '前缀';
+
+    $lang->admin_title = '管理员信息';
+
+    $lang->env_title = '环境设置';
+    $lang->use_optimizer = '使用Optimizer';
+    $lang->about_optimizer = '使用Optimizer可以对大部分的CSS/ JS文件进行整合/压缩传送使之加快网站访问速度。<br />只是有时会发生小小的问题。这时候请暂时不要使用Optimizer。';
+    $lang->use_rewrite = '使用rewrite模块';
+    $lang->about_rewrite = '如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。';
+    $lang->time_zone = '时区';
     $lang->about_time_zone = '服务器时间和您所处的时间有差异时，可以设置时区来满足你所需要的时间显示。';
     $lang->qmail_compatibility = 'Qmail互换';
-    $lang->about_qmail_compatibility = '支持不能识别CRLF为换行符的Qmail等MTA，也能发送电子邮件。';
-
-    $lang->about_database_file = 'Sqlite是文件里保存数据。数据库的文件位置应该放在web不能访问的地方。<br/><span style="color:red">数据文件应放在具有707属性的位置。</span>';
-
-    $lang->success_installed = '已完成安装。';
-    $lang->success_updated = '已完成更新。';
-
-    $lang->msg_cannot_proc = '不具备安装所需环境，不能继续进行。';
-    $lang->msg_already_installed = '已安装';
-    $lang->msg_dbconnect_failed = "连接DB时发生错误。\n请重新确认DB信息。";
-    $lang->msg_table_is_exists = "已生成数据表。\n重新生成了config文件。";
-    $lang->msg_install_completed = "安装完成。\n非常感谢。";
-    $lang->msg_install_failed = "生成安装文件时发生错误。";
-?>
+    $lang->about_qmail_compatibility = '支持不能识别CRLF为换行符的Qmail等MTA，也能发送电子邮件。';
+
+    $lang->about_database_file = 'Sqlite是文件里保存数据。数据库的文件位置应该放在web不能访问的地方。<br/><span style="color:red">数据文件应放在具有707属性的位置。</span>';
+
+    $lang->success_installed = '已完成安装。';
+    $lang->success_updated = '已完成更新。';
+
+    $lang->msg_cannot_proc = '不具备安装所需环境，不能继续进行。';
+    $lang->msg_already_installed = '已安装';
+    $lang->msg_dbconnect_failed = "连接DB时发生错误。\n请重新确认DB信息。";
+    $lang->msg_table_is_exists = "已生成数据表。\n重新生成了config文件。";
+    $lang->msg_install_completed = "安装完成。\n非常感谢。";
+    $lang->msg_install_failed = "生成安装文件时发生错误。";
+?>
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html
index c39132d9d..c07e73dc4 100644
--- a/modules/install/tpl/introduce.html
+++ b/modules/install/tpl/introduce.html
@@ -7,9 +7,7 @@
 <div class="tCenter">
     Select language : <select name="lang_type" onchange="doChangeLangType(this)">
         <!--@foreach($lang_supported as $key => $val)-->
-        <!--@if($val != $lang_type)-->
-        <option value="{$key}">{$val}</option>
-        <!--@end-->
+        <option value="{$key}" <!--@if($key == $lang_type)-->selected="selected"<!--@end-->>{$val}</option>
         <!--@end-->
     </select>
 </div>

From 5baf00255157605fa26907f21f8a90b5886cb7fb Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 14 May 2008 07:54:31 +0000
Subject: [PATCH 098/111] =?UTF-8?q?tab=20=EB=A7=9E=EC=B6=A4?=
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@4196 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.controller.php |  6 ++--
 modules/point/point.admin.controller.php |  4 +--
 modules/point/point.class.php            | 20 ++++++-------
 modules/point/point.controller.php       | 38 ++++++++++++------------
 modules/point/point.view.php             |  6 ++--
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index cb58526d2..caa34884d 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -425,9 +425,9 @@
             // 세션 정보에 남김
             $_SESSION['voted_document'][$document_srl] = true;
 
-	    $obj->member_srl = $oDocument->get('member_srl');
-	    $obj->module_srl = $oDocument->get('module_srl');
-	    $obj->point = $point;
+            $obj->member_srl = $oDocument->get('member_srl');
+            $obj->module_srl = $oDocument->get('module_srl');
+            $obj->point = $point;
             $output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $obj);
             if(!$output->toBool()) return $output;
 
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index d1fa15f59..964a840e8 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -36,8 +36,8 @@
             $config->insert_comment = (int)$args->insert_comment;
             $config->upload_file = (int)$args->upload_file;
             $config->download_file = (int)$args->download_file;
-	    $config->voted = (int)$args->voted;
-	    $config->blamed = (int)$args->blamed;
+            $config->voted = (int)$args->voted;
+            $config->blamed = (int)$args->blamed;
 
             // 최고 레벨
             $config->max_level = $args->max_level;
diff --git a/modules/point/point.class.php b/modules/point/point.class.php
index 5c67e638f..02a6c36e4 100644
--- a/modules/point/point.class.php
+++ b/modules/point/point.class.php
@@ -75,9 +75,9 @@
             // 조회
             $config->read_document = 0;
 
-	    // 추천 / 비추천
-	    $config->voted = 0;
-	    $config->blamed = 0;
+            // 추천 / 비추천
+            $config->voted = 0;
+            $config->blamed = 0;
 
             // 설정 저장
             $oModuleController->insertModuleConfig('point', $config);
@@ -100,8 +100,8 @@
             $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
             $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
 
-	    // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
-	    $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+            // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
+            $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
 
             return new Object();
         }
@@ -128,8 +128,8 @@
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
             if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
 
-	    // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
-	    if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
+            // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
+            if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
 
             return false;
         }
@@ -170,9 +170,9 @@
             if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
                 $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
 
-	    // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
-	    if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
-		$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+            // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
+            if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
+                $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
 
             return new Object(0, 'success_updated');
         }
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index 349453af7..1f39bfc74 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -351,11 +351,11 @@
             return new Object();
         }
 
-	/**
-	 * @brief 추천/비추천 시 포인트 적용
-	 **/
-	
-	function triggerUpdateVotedCount(&$obj) {
+        /**
+         * @brief 추천/비추천 시 포인트 적용
+         **/
+
+        function triggerUpdateVotedCount(&$obj) {
             $module_srl = $obj->module_srl;
             $member_srl = $obj->member_srl;
             if(!$module_srl || !$member_srl) return new Object();
@@ -365,26 +365,26 @@
 
             $oPointModel = &getModel('point');
             $cur_point = $oPointModel->getPoint($member_srl, true);
-    
-	    if( $obj->point > 0 )
-	    {
-		$point = $config->module_point[$module_srl]['voted'];
-		if(!isset($point)) $point = $config->voted;
-	    }
-	    else
-	    {
-		$point = $config->module_point[$module_srl]['blamed'];
-		if(!isset($point)) $point = $config->blamed;
-	    }
+
+            if( $obj->point > 0 )
+            {
+                $point = $config->module_point[$module_srl]['voted'];
+                if(!isset($point)) $point = $config->voted;
+            }
+            else
+            {
+                $point = $config->module_point[$module_srl]['blamed'];
+                if(!isset($point)) $point = $config->blamed;
+            }
 
             if(!$point) return new Object();
 
             // 포인트 증감
             $cur_point += $point;
             $this->setPoint($member_srl,$cur_point);
-	    
-	    return new Object();
-	}
+
+            return new Object();
+        }
 
         /**
          * @brief 포인트 설정
diff --git a/modules/point/point.view.php b/modules/point/point.view.php
index d3333ae26..aaff82516 100644
--- a/modules/point/point.view.php
+++ b/modules/point/point.view.php
@@ -43,9 +43,9 @@
                 $module_config['download_file'] = $config->download_file;
                 $module_config['read_document'] = $config->read_document;
 
-		//2008.05.13 haneul
-		$module_config['voted'] = $config->voted;
-		$module_config['blamed'] = $config->blamed;
+                //2008.05.13 haneul
+                $module_config['voted'] = $config->voted;
+                $module_config['blamed'] = $config->blamed;
             }
 
             $module_config['module_srl'] = $current_module_srl;

From ee8e180f22b8e703218f467fd52789f5e08b028b Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 14 May 2008 08:30:36 +0000
Subject: [PATCH 099/111] =?UTF-8?q?comment=EB=8F=84=20=EC=B6=94=EC=B2=9C/?=
 =?UTF-8?q?=EB=B9=84=EC=B6=94=EC=B2=9C=20=EA=B5=AC=EB=B6=84?=
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@4197 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/skins/xe_board/comment.html     |  4 ++--
 modules/comment/comment.class.php             | 12 +++++++++++
 modules/comment/comment.controller.php        | 21 ++++++++++++++++---
 .../comment/queries/insertCommentVotedLog.xml |  1 +
 modules/comment/queries/updateBlamedCount.xml | 11 ++++++++++
 modules/comment/schemas/comment_voted_log.xml |  1 +
 modules/comment/schemas/comments.xml          |  1 +
 7 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 modules/comment/queries/updateBlamedCount.xml

diff --git a/modules/board/skins/xe_board/comment.html b/modules/board/skins/xe_board/comment.html
index 58b734212..bbce49468 100644
--- a/modules/board/skins/xe_board/comment.html
+++ b/modules/board/skins/xe_board/comment.html
@@ -40,10 +40,10 @@
             <!--@end-->
             </div>
 
-            <!--@if($comment->get('voted_count')!=0)-->
+            <!--@if($comment->get('voted_count')!=0 || $comment->get('blamed_count') != 0)-->
             <div class="voted">
                 ({$lang->voted_count}:
-                <strong>{$comment->get('voted_count')}</strong>)
+                <strong>{$comment->get('voted_count')?$comment->get('voted_count'):0}</strong> / <strong>{$comment->get('blamed_count')?$comment->get('blamed_count'):0}</strong>)
             </div>
             <!--@end-->
 
diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php
index 04e4952d4..a59119792 100644
--- a/modules/comment/comment.class.php
+++ b/modules/comment/comment.class.php
@@ -52,6 +52,10 @@
             // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) return true;
 
+            // 2008. 05. 14 blamed count 컬럼 추가
+            if(!$oDB->isColumnExists("comments", "blamed_count")) return true;
+            if(!$oDB->isColumnExists("comment_voted_log", "point")) return true;
+
             return false;
         }
 
@@ -88,6 +92,14 @@
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) 
                 $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 
+            // 2008. 05. 14 blamed count 컬럼 추가
+            if(!$oDB->isColumnExists("comments", "blamed_count")) {
+                $oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, true); 
+                $oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
+            }
+            if(!$oDB->isColumnExists("comment_voted_log", "point"))
+                $oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, true); 
+
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 86efca68f..543746fbf 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -398,6 +398,9 @@
          * @brief 해당 comment의 추천수 증가
          **/
         function updateVotedCount($comment_srl, $point = 1) {
+            if($point > 0) $failed_voted = 'failed_voted';
+            else $failed_voted = 'failed_blamed';
+
             // 세션 정보에 추천 정보가 있으면 중단
             if($_SESSION['voted_comment'][$comment_srl]) return new Object(-1, 'failed_voted');
 
@@ -440,17 +443,29 @@
             }
 
             // 추천수 업데이트
-            $args->voted_count = $oComment->get('voted_count') + $point;
-            $output = executeQuery('comment.updateVotedCount', $args);
+            if($point < 0)
+            {
+                $args->blamed_count = $oComment->get('blamed_count') + $point;
+                $output = executeQuery('comment.updateBlamedCount', $args);
+            }
+            else
+            {
+                $args->voted_count = $oComment->get('voted_count') + $point;
+                $output = executeQuery('comment.updateVotedCount', $args);
+            }
 
             // 로그 남기기
+            $args->point = $point;
             $output = executeQuery('comment.insertCommentVotedLog', $args);
 
             // 세션 정보에 남김
             $_SESSION['voted_comment'][$comment_srl] = true;
 
             // 결과 리턴
-            return new Object(0, 'success_voted');
+            if($point > 0)
+                return new Object(0, 'success_voted');
+            else
+                return new Object(0, 'success_blamed');
         }
 
         /**
diff --git a/modules/comment/queries/insertCommentVotedLog.xml b/modules/comment/queries/insertCommentVotedLog.xml
index 37bfe5ce2..6d9ab5020 100644
--- a/modules/comment/queries/insertCommentVotedLog.xml
+++ b/modules/comment/queries/insertCommentVotedLog.xml
@@ -7,5 +7,6 @@
         <column name="member_srl" var="member_srl" filter="number" default="0" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="regdate" var="regdate" default="curdate()" />
+	    <column name="point" var="point" filter="number" default="0"/>
     </columns>
 </query>
diff --git a/modules/comment/queries/updateBlamedCount.xml b/modules/comment/queries/updateBlamedCount.xml
new file mode 100644
index 000000000..ccb3cff47
--- /dev/null
+++ b/modules/comment/queries/updateBlamedCount.xml
@@ -0,0 +1,11 @@
+<query id="updateBlamedCount" action="update">
+    <tables>
+        <table name="comments" />
+    </tables>
+    <columns>
+        <column name="blamed_count" var="blamed_count" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="comment_srl" var="comment_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/comment/schemas/comment_voted_log.xml b/modules/comment/schemas/comment_voted_log.xml
index d5d2ff155..095cca0f8 100644
--- a/modules/comment/schemas/comment_voted_log.xml
+++ b/modules/comment/schemas/comment_voted_log.xml
@@ -3,4 +3,5 @@
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
     <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
     <column name="regdate" type="date" index="idx_regdate" />
+    <column name="point" type="number" size="11" notnull="notnull" />
 </table>
diff --git a/modules/comment/schemas/comments.xml b/modules/comment/schemas/comments.xml
index e381b7f0c..c272c5d53 100644
--- a/modules/comment/schemas/comments.xml
+++ b/modules/comment/schemas/comments.xml
@@ -6,6 +6,7 @@
     <column name="is_secret" type="char" size="1" default="N" notnull="notnull" />
     <column name="content" type="bigtext" notnull="notnull" />
     <column name="voted_count" type="number" size="11" default="0" notnull="notnull" index="idx_voted_count" />
+    <column name="blamed_count" type="number" size="11" default="0" notnull="notnull" index="idx_blamed_count" />
     <column name="notify_message" type="char" size="1" default="N" notnull="notnull" />
     <column name="password" type="varchar" size="60" />
     <column name="user_id" type="varchar" size="80" />

From bfa2c9bd97071192fd7556034dc448749c7be5e4 Mon Sep 17 00:00:00 2001
From: chinaskyking <chinaskyking@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 14 May 2008 09:50:27 +0000
Subject: [PATCH 100/111] =?UTF-8?q?qmail=5Fcompatibility=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B3=B8=EC=96=B4=EB=B2=88=EC=97=AD.?=
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@4198 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/jp.lang.php | 93 ++++++++++++++++----------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
index 5d78ddab6..2c00d22b1 100644
--- a/modules/install/lang/jp.lang.php
+++ b/modules/install/lang/jp.lang.php
@@ -23,84 +23,84 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc.  59 Temple Place - Suite
 
 
 はじめに
-ソフトウェア向けライセンスの大半は、あなたがそのソフトウェアを共有したり変更したりする自由を奪うように設計されています。対照的に、GNU 一般公衆利用許諾契約書は、あなたがフリーソフトウェアを共有したり変更したりする自由を保証する--すなわち、ソフトウェアがそのユーザすべてにとってフリーであることを保証することを目的としています。この一般公衆利用許諾契約書はフリーソフトウェア財団のソフトウェアのほとんどに適用されており、また GNU GPLを適用すると決めたフリーソフトウェア財団以外の作者によるプログラムにも適用されています(いくつかのフリーソフトウェア財団のソフトウェアには、GNU GPLではなくGNU ライブラリ一般公衆利用許諾契約書が適用されています)。あなたもまた、ご自分のプログラムにGNU GPLを適用することが可能です。 
+ソフトウェア向けライセンスの大半は、あなたがそのソフトウェアを共有したり変更したりする自由を奪うように設計されています。対照的に、GNU 一般公衆利用許諾契約書は、あなたがフリーソフトウェアを共有したり変更したりする自由を保証する--すなわち、ソフトウェアがそのユーザすべてにとってフリーであることを保証することを目的としています。この一般公衆利用許諾契約書はフリーソフトウェア財団のソフトウェアのほとんどに適用されており、また GNU GPLを適用すると決めたフリーソフトウェア財団以外の作者によるプログラムにも適用されています(いくつかのフリーソフトウェア財団のソフトウェアには、GNU GPLではなくGNU ライブラリ一般公衆利用許諾契約書が適用されています)。あなたもまた、ご自分のプログラムにGNU GPLを適用することが可能です。
 
-私たちがフリーソフトウェアと言うとき、それは利用の自由について言及しているのであって、価格は問題にしていません。私たちの一般公衆利用許諾契約書は、あなたがフリーソフトウェアの複製物を頒布する自由を保証するよう設計されています(希望に応じてその種のサービスに手数料を課す自由も保証されます)。また、あなたがソースコードを受け取るか、あるいは望めばそれを入手することが可能であるということ、あなたがソフトウェアを変更し、その一部を新たなフリーのプログラムで利用できるということ、そして、以上で述べたようなことができるということがあなたに知らされるということも保証されます。 
+私たちがフリーソフトウェアと言うとき、それは利用の自由について言及しているのであって、価格は問題にしていません。私たちの一般公衆利用許諾契約書は、あなたがフリーソフトウェアの複製物を頒布する自由を保証するよう設計されています(希望に応じてその種のサービスに手数料を課す自由も保証されます)。また、あなたがソースコードを受け取るか、あるいは望めばそれを入手することが可能であるということ、あなたがソフトウェアを変更し、その一部を新たなフリーのプログラムで利用できるということ、そして、以上で述べたようなことができるということがあなたに知らされるということも保証されます。
 
-あなたの権利を守るため、私たちは誰かがあなたの有するこれらの権利を否定することや、これらの権利を放棄するよう要求することを禁止するという制限を加える必要があります。よって、あなたがソフトウェアの複製物を頒布したりそれを変更したりする場合には、そういった制限のためにあなたにある種の責任が発生することになります。 
+あなたの権利を守るため、私たちは誰かがあなたの有するこれらの権利を否定することや、これらの権利を放棄するよう要求することを禁止するという制限を加える必要があります。よって、あなたがソフトウェアの複製物を頒布したりそれを変更したりする場合には、そういった制限のためにあなたにある種の責任が発生することになります。
 
-例えば、あなたがフリーなプログラムの複製物を頒布する場合、有料か無料に関わらず、あなたは自分が有する権利を全て受領者に与えなければなりません。また、あなたは彼らもソースコードを受け取るか手に入れることができるよう保証しなければなりません。そして、あなたは彼らに対して以下で述べる条件を示し、彼らに自らの持つ権利について知らしめるようにしなければなりません。 
+例えば、あなたがフリーなプログラムの複製物を頒布する場合、有料か無料に関わらず、あなたは自分が有する権利を全て受領者に与えなければなりません。また、あなたは彼らもソースコードを受け取るか手に入れることができるよう保証しなければなりません。そして、あなたは彼らに対して以下で述べる条件を示し、彼らに自らの持つ権利について知らしめるようにしなければなりません。
 
-私たちはあなたの権利を二段階の手順を踏んで保護します。(1) まずソフトウェアに対して著作権を主張し、そして (2) あなたに対して、ソフトウェアの複製や頒布または改変についての法的な許可を与えるこの契約書を提示します。 
+私たちはあなたの権利を二段階の手順を踏んで保護します。(1) まずソフトウェアに対して著作権を主張し、そして (2) あなたに対して、ソフトウェアの複製や頒布または改変についての法的な許可を与えるこの契約書を提示します。
 
-また、各作者や私たちを保護するため、私たちはこのフリーソフトウェアには何の保証も無いということを誰もが確実に理解するようにし、またソフトウェアが誰か他人によって改変され、それが次々と頒布されていったとしても、その受領者は彼らが手に入れたソフトウェアがオリジナルのバージョンでは無いこと、そして原作者の名声は他人によって持ち込まれた可能性のある問題によって影響されることがないということを周知させたいと思います。 
+また、各作者や私たちを保護するため、私たちはこのフリーソフトウェアには何の保証も無いということを誰もが確実に理解するようにし、またソフトウェアが誰か他人によって改変され、それが次々と頒布されていったとしても、その受領者は彼らが手に入れたソフトウェアがオリジナルのバージョンでは無いこと、そして原作者の名声は他人によって持ち込まれた可能性のある問題によって影響されることがないということを周知させたいと思います。
 
-最後に、ソフトウェア特許がいかなるフリーのプログラムの存在にも不断の脅威を投げかけていますが、私たちは、フリーなプログラムの再頒布者が個々に特許ライセンスを取得することによって、事実上プログラムを独占的にしてしまうという危険を避けたいと思います。こういった事態を予防するため、私たちはいかなる特許も誰もが自由に利用できるようライセンスされるか、全くライセンスされないかのどちらかでなければならないことを明確にしました。 
+最後に、ソフトウェア特許がいかなるフリーのプログラムの存在にも不断の脅威を投げかけていますが、私たちは、フリーなプログラムの再頒布者が個々に特許ライセンスを取得することによって、事実上プログラムを独占的にしてしまうという危険を避けたいと思います。こういった事態を予防するため、私たちはいかなる特許も誰もが自由に利用できるようライセンスされるか、全くライセンスされないかのどちらかでなければならないことを明確にしました。
 
-複製や頒布、改変についての正確な条件と制約を以下で述べていきます。 
+複製や頒布、改変についての正確な条件と制約を以下で述べていきます。
 
 複製、頒布、改変に関する条件と制約
-0. この利用許諾契約書は、そのプログラム(またはその他の著作物)をこの一般公衆利用許諾契約書の定める条件の下で頒布できる、という告知が著作権者によって記載されたプログラムまたはその他の著作物全般に適用される。以下では、「『プログラム』」とはそのようにしてこの契約書が適用されたプログラムや著作物全般を意味し、また「『プログラム』を基にした著作物」とは『プログラム』やその他著作権法の下で派生物と見なされるもの全般を指す。すなわち、『プログラム』かその一部を、全く同一のままか、改変を加えたか、あるいは他の言語に翻訳された形で含む著作物のことである(「改変」という語の本来の意味からはずれるが、以下では翻訳も改変の一種と見なす)。それぞれの契約者は「あなた」と表現される。 
+0. この利用許諾契約書は、そのプログラム(またはその他の著作物)をこの一般公衆利用許諾契約書の定める条件の下で頒布できる、という告知が著作権者によって記載されたプログラムまたはその他の著作物全般に適用される。以下では、「『プログラム』」とはそのようにしてこの契約書が適用されたプログラムや著作物全般を意味し、また「『プログラム』を基にした著作物」とは『プログラム』やその他著作権法の下で派生物と見なされるもの全般を指す。すなわち、『プログラム』かその一部を、全く同一のままか、改変を加えたか、あるいは他の言語に翻訳された形で含む著作物のことである(「改変」という語の本来の意味からはずれるが、以下では翻訳も改変の一種と見なす)。それぞれの契約者は「あなた」と表現される。
 
-複製や頒布、改変以外の活動はこの契約書ではカバーされない。それらはこの契約書の対象外である。『プログラム』を実行する行為自体に制限はない。また、そのような『プログラム』の出力結果は、その内容が『プログラム』を基にした著作物を構成する場合のみこの契約書によって保護される(『プログラム』を実行したことによって作成されたということとは無関係である)。このような線引きの妥当性は、『プログラム』が何をするのかに依存する。 
+複製や頒布、改変以外の活動はこの契約書ではカバーされない。それらはこの契約書の対象外である。『プログラム』を実行する行為自体に制限はない。また、そのような『プログラム』の出力結果は、その内容が『プログラム』を基にした著作物を構成する場合のみこの契約書によって保護される(『プログラム』を実行したことによって作成されたということとは無関係である)。このような線引きの妥当性は、『プログラム』が何をするのかに依存する。
 
-1. それぞれの複製物において適切な著作権表示と保証の否認声明(disclaimer of warranty)を目立つよう適切に掲載し、またこの契約書および一切の保証の不在に触れた告知すべてをそのまま残し、そしてこの契約書の複製物を『プログラム』のいかなる受領者にも『プログラム』と共に頒布する限り、あなたは『プログラム』のソースコードの複製物を、あなたが受け取った通りの形で複製または頒布することができる。媒体は問わない。 
+1. それぞれの複製物において適切な著作権表示と保証の否認声明(disclaimer of warranty)を目立つよう適切に掲載し、またこの契約書および一切の保証の不在に触れた告知すべてをそのまま残し、そしてこの契約書の複製物を『プログラム』のいかなる受領者にも『プログラム』と共に頒布する限り、あなたは『プログラム』のソースコードの複製物を、あなたが受け取った通りの形で複製または頒布することができる。媒体は問わない。
 
-あなたは、物理的に複製物を譲渡するという行為に関して手数料を課しても良いし、希望によっては手数料を取って交換における保護の保証を提供しても良い。 
+あなたは、物理的に複製物を譲渡するという行為に関して手数料を課しても良いし、希望によっては手数料を取って交換における保護の保証を提供しても良い。
 
-2. あなたは自分の『プログラム』の複製物かその一部を改変して『プログラム』を基にした著作物を形成し、そのような改変点や著作物を上記第1節の定める条件の下で複製または頒布することができる。ただし、そのためには以下の条件すべてを満たしていなければならない: 
+2. あなたは自分の『プログラム』の複製物かその一部を改変して『プログラム』を基にした著作物を形成し、そのような改変点や著作物を上記第1節の定める条件の下で複製または頒布することができる。ただし、そのためには以下の条件すべてを満たしていなければならない:
 
-a) あなたがそれらのファイルを変更したということと変更した日時が良く 分かるよう、改変されたファイルに告示しなければならない。 
+a) あなたがそれらのファイルを変更したということと変更した日時が良く 分かるよう、改変されたファイルに告示しなければならない。
 
-b) 『プログラム』またはその一部を含む著作物、あるいは『プログラム』 かその一部から派生した著作物を頒布あるいは発表する場合には、その 全体をこの契約書の条件に従って第三者へ無償で利用許諾しなけれ ばならない。 
+b) 『プログラム』またはその一部を含む著作物、あるいは『プログラム』 かその一部から派生した著作物を頒布あるいは発表する場合には、その 全体をこの契約書の条件に従って第三者へ無償で利用許諾しなけれ ばならない。
 
-c) 改変されたプログラムが、通常実行する際に対話的にコマンドを読むよ うになっているならば、そのプログラムを最も一般的な方法で対話的に 実行する際、適切な著作権表示、無保証であること(あるいはあなたが保 証を提供するということ)、ユーザがプログラムをこの契約書で述べた条 件の下で頒布することができるということ、そしてこの契約書の複製物 を閲覧するにはどうしたらよいかというユーザへの説明を含む告知が印 刷されるか、あるいは画面に表示されるようにしなければならない(例外 として、『プログラム』そのものは対話的であっても通常そのような告 知を印刷しない場合には、『プログラム』を基にしたあなたの著作物に そのような告知を印刷させる必要はない)。 
+c) 改変されたプログラムが、通常実行する際に対話的にコマンドを読むよ うになっているならば、そのプログラムを最も一般的な方法で対話的に 実行する際、適切な著作権表示、無保証であること(あるいはあなたが保 証を提供するということ)、ユーザがプログラムをこの契約書で述べた条 件の下で頒布することができるということ、そしてこの契約書の複製物 を閲覧するにはどうしたらよいかというユーザへの説明を含む告知が印 刷されるか、あるいは画面に表示されるようにしなければならない(例外 として、『プログラム』そのものは対話的であっても通常そのような告 知を印刷しない場合には、『プログラム』を基にしたあなたの著作物に そのような告知を印刷させる必要はない)。
 
-以上の必要条件は全体としての改変された著作物に適用される。著作物の一部が『プログラム』から派生したものではないと確認でき、それら自身別の独立した著作物であると合理的に考えられるならば、あなたがそれらを別の著作物として分けて頒布する場合、そういった部分にはこの契約書とその条件は適用されない。しかし、あなたが同じ部分を『プログラム』を基にした著作物全体の一部として頒布するならば、全体としての頒布物は、この契約書が課す条件に従わなければならない。というのは、この契約書が他の契約者に与える許可は『プログラム』丸ごと全体に及び、誰が書いたかは関係なく各部分のすべてを保護するからである。 
+以上の必要条件は全体としての改変された著作物に適用される。著作物の一部が『プログラム』から派生したものではないと確認でき、それら自身別の独立した著作物であると合理的に考えられるならば、あなたがそれらを別の著作物として分けて頒布する場合、そういった部分にはこの契約書とその条件は適用されない。しかし、あなたが同じ部分を『プログラム』を基にした著作物全体の一部として頒布するならば、全体としての頒布物は、この契約書が課す条件に従わなければならない。というのは、この契約書が他の契約者に与える許可は『プログラム』丸ごと全体に及び、誰が書いたかは関係なく各部分のすべてを保護するからである。
 
-よって、すべてあなたによって書かれた著作物に対し、権利を主張したりあなたの権利に異議を申し立てることはこの節の意図するところではない。むしろ、その趣旨は『プログラム』を基にした派生物ないし集合著作物の頒布を管理する権利を行使するということにある。 
+よって、すべてあなたによって書かれた著作物に対し、権利を主張したりあなたの権利に異議を申し立てることはこの節の意図するところではない。むしろ、その趣旨は『プログラム』を基にした派生物ないし集合著作物の頒布を管理する権利を行使するということにある。
 
-また、『プログラム』を基にしていないその他の著作物を『プログラム』(あるいは『プログラム』を基にした著作物)と一緒に集めただけのものを一巻の保管装置ないし頒布媒体に収めても、その他の著作物までこの契約書が保護する対象になるということにはならない。 
+また、『プログラム』を基にしていないその他の著作物を『プログラム』(あるいは『プログラム』を基にした著作物)と一緒に集めただけのものを一巻の保管装置ないし頒布媒体に収めても、その他の著作物までこの契約書が保護する対象になるということにはならない。
 
-3. あなたは上記第1節および2節の条件に従い、『プログラム』(あるいは第2節における派生物)をオブジェクトコードないし実行形式で複製または頒布することができる。ただし、その場合あなたは以下のうちどれか一つを実施しなければならない: 
+3. あなたは上記第1節および2節の条件に従い、『プログラム』(あるいは第2節における派生物)をオブジェクトコードないし実行形式で複製または頒布することができる。ただし、その場合あなたは以下のうちどれか一つを実施しなければならない:
 
-a) 著作物に、『プログラム』に対応した完全かつ機械で読み取り可能なソー スコードを添付する。ただし、ソースコードは上記第1節および2節の条 件に従いソフトウェアの交換で習慣的に使われる媒体で頒布しなければ ならない。あるいは、 
+a) 著作物に、『プログラム』に対応した完全かつ機械で読み取り可能なソー スコードを添付する。ただし、ソースコードは上記第1節および2節の条 件に従いソフトウェアの交換で習慣的に使われる媒体で頒布しなければ ならない。あるいは、
 
-b) 著作物に、いかなる第三者に対しても、『プログラム』に対応した完全 かつ機械で読み取り可能なソースコードを、頒布に要する物理的コスト を上回らない程度の手数料と引き換えに提供する旨述べた少なくとも3年 間は有効な書面になった申し出を添える。ただし、ソースコードは上記 第1節および2節の条件に従いソフトウェアの交換で習慣的に使われる媒 体で頒布しなければならない。あるいは、 
+b) 著作物に、いかなる第三者に対しても、『プログラム』に対応した完全 かつ機械で読み取り可能なソースコードを、頒布に要する物理的コスト を上回らない程度の手数料と引き換えに提供する旨述べた少なくとも3年 間は有効な書面になった申し出を添える。ただし、ソースコードは上記 第1節および2節の条件に従いソフトウェアの交換で習慣的に使われる媒 体で頒布しなければならない。あるいは、
 
-c) 対応するソースコード頒布の申し出に際して、あなたが得た情報を一緒 に引き渡す(この選択肢は、営利を目的としない頒布であって、かつあな たが上記小節bで指定されているような申し出と共にオブジェクトコード あるいは実行形式のプログラムしか入手していない場合に限り許可され る)。 
+c) 対応するソースコード頒布の申し出に際して、あなたが得た情報を一緒 に引き渡す(この選択肢は、営利を目的としない頒布であって、かつあな たが上記小節bで指定されているような申し出と共にオブジェクトコード あるいは実行形式のプログラムしか入手していない場合に限り許可され る)。
 
-著作物のソースコードとは、それに対して改変を加える上で好ましいとされる著作物の形式を意味する。ある実行形式の著作物にとって完全なソースコードとは、それが含むモジュールすべてのソースコード全部に加え、関連するインターフェース定義ファイルのすべてとライブラリのコンパイルやインストールを制御するために使われるスクリプトをも加えたものを意味する。しかし特別な例外として、そのコンポーネント自体が実行形式に付随するのでは無い限り、頒布されるものの中に、実行形式が実行されるオペレーティングシステムの主要なコンポーネント(コンパイラやカーネル等)と通常一緒に(ソースかバイナリ形式のどちらかで)頒布されるものを含んでいる必要はないとする。 
+著作物のソースコードとは、それに対して改変を加える上で好ましいとされる著作物の形式を意味する。ある実行形式の著作物にとって完全なソースコードとは、それが含むモジュールすべてのソースコード全部に加え、関連するインターフェース定義ファイルのすべてとライブラリのコンパイルやインストールを制御するために使われるスクリプトをも加えたものを意味する。しかし特別な例外として、そのコンポーネント自体が実行形式に付随するのでは無い限り、頒布されるものの中に、実行形式が実行されるオペレーティングシステムの主要なコンポーネント(コンパイラやカーネル等)と通常一緒に(ソースかバイナリ形式のどちらかで)頒布されるものを含んでいる必要はないとする。
 
-実行形式またはオブジェクトコードの頒布が、指定された場所からコピーするためのアクセス手段を提供することで為されるとして、その上でソースコードも同等のアクセス手段によって同じ場所からコピーできるようになっているならば、第三者がオブジェクトコードと一緒にソースも強制的にコピーさせられるようになっていなくてもソースコード頒布の条件を満たしているものとする。 
+実行形式またはオブジェクトコードの頒布が、指定された場所からコピーするためのアクセス手段を提供することで為されるとして、その上でソースコードも同等のアクセス手段によって同じ場所からコピーできるようになっているならば、第三者がオブジェクトコードと一緒にソースも強制的にコピーさせられるようになっていなくてもソースコード頒布の条件を満たしているものとする。
 
-4. あなたは『プログラム』を、この契約書において明確に提示された行為を除き複製や改変、サブライセンス、あるいは頒布してはならない。他に『プログラム』を複製や改変、サブライセンス、あるいは頒布する企てはすべて無効であり、この契約書の下でのあなたの権利を自動的に終結させることになろう。しかし、複製物や権利をこの契約書に従ってあなたから得た人々に関しては、そのような人々がこの契約書に完全に従っている限り彼らのライセンスまで終結することはない。 
+4. あなたは『プログラム』を、この契約書において明確に提示された行為を除き複製や改変、サブライセンス、あるいは頒布してはならない。他に『プログラム』を複製や改変、サブライセンス、あるいは頒布する企てはすべて無効であり、この契約書の下でのあなたの権利を自動的に終結させることになろう。しかし、複製物や権利をこの契約書に従ってあなたから得た人々に関しては、そのような人々がこの契約書に完全に従っている限り彼らのライセンスまで終結することはない。
 
-5. あなたはこの契約書を受諾する必要は無い。というのは、あなたはこれに署名していないからである。しかし、この契約書以外にあなたに対して『プログラム』やその派生物を改変または頒布する許可を与えるものは存在しない。これらの行為は、あなたがこの契約書を受け入れない限り法によって禁じられている。そこで、『プログラム』(あるいは『プログラム』を基にした著作物全般) を改変ないし頒布することにより、あなたは自分がそのような行為を行うためにこの契約書を受諾したということ、そして『プログラム』とそれに基づく著作物の複製や頒布、改変についてこの契約書が課す制約と条件をすべて受け入れたということを示したものと見なす。 
+5. あなたはこの契約書を受諾する必要は無い。というのは、あなたはこれに署名していないからである。しかし、この契約書以外にあなたに対して『プログラム』やその派生物を改変または頒布する許可を与えるものは存在しない。これらの行為は、あなたがこの契約書を受け入れない限り法によって禁じられている。そこで、『プログラム』(あるいは『プログラム』を基にした著作物全般) を改変ないし頒布することにより、あなたは自分がそのような行為を行うためにこの契約書を受諾したということ、そして『プログラム』とそれに基づく著作物の複製や頒布、改変についてこの契約書が課す制約と条件をすべて受け入れたということを示したものと見なす。
 
-6. あなたが『プログラム』(または『プログラム』を基にした著作物全般)を再頒布するたびに、その受領者は元々のライセンス許可者から、この契約書で指定された条件と制約の下で『プログラム』を複製や頒布、あるいは改変する許可を自動的に得るものとする。あなたは、受領者がここで認められた権利を行使することに関してこれ以上他のいかなる制限も課してはならない。あなたには、第三者がこの契約書に従うことを強制する責任はない。 
+6. あなたが『プログラム』(または『プログラム』を基にした著作物全般)を再頒布するたびに、その受領者は元々のライセンス許可者から、この契約書で指定された条件と制約の下で『プログラム』を複製や頒布、あるいは改変する許可を自動的に得るものとする。あなたは、受領者がここで認められた権利を行使することに関してこれ以上他のいかなる制限も課してはならない。あなたには、第三者がこの契約書に従うことを強制する責任はない。
 
-7. 特許侵害あるいはその他の理由(特許関係に限らない)から、裁判所の判決あるいは申し立ての結果としてあなたに(裁判所命令や契約などにより)このライセンスの条件と矛盾する制約が課された場合でも、あなたがこの契約書の条件を免除されるわけではない。もしこの契約書の下であなたに課せられた責任と他の関連する責任を同時に満たすような形で頒布できないならば、結果としてあなたは『プログラム』を頒布することが全くできないということである。例えば特許ライセンスが、あなたから直接間接を問わずコピーを受け取った人が誰でも『プログラム』を使用料無料で再頒布することを認めていない場合、あなたがその制約とこの契約書を両方とも満たすには『プログラム』の頒布を完全に中止するしかないだろう。 
+7. 特許侵害あるいはその他の理由(特許関係に限らない)から、裁判所の判決あるいは申し立ての結果としてあなたに(裁判所命令や契約などにより)このライセンスの条件と矛盾する制約が課された場合でも、あなたがこの契約書の条件を免除されるわけではない。もしこの契約書の下であなたに課せられた責任と他の関連する責任を同時に満たすような形で頒布できないならば、結果としてあなたは『プログラム』を頒布することが全くできないということである。例えば特許ライセンスが、あなたから直接間接を問わずコピーを受け取った人が誰でも『プログラム』を使用料無料で再頒布することを認めていない場合、あなたがその制約とこの契約書を両方とも満たすには『プログラム』の頒布を完全に中止するしかないだろう。
 
-この節の一部分が特定の状況の下で無効ないし実施不可能な場合でも、節の残りの部分は適用されるよう意図されている。その他の状況では節が全体として適用されるよう意図されている。 
+この節の一部分が特定の状況の下で無効ないし実施不可能な場合でも、節の残りの部分は適用されるよう意図されている。その他の状況では節が全体として適用されるよう意図されている。
 
-特許やその他の財産権を侵害したり、そのような権利の主張の効力に異議を唱えたりするようあなたを誘惑することがこの節の目的ではない。この節には、人々によってライセンス慣行として実現されてきた、フリーソフトウェア頒布のシステムの完全性を護るという目的しかない。多くの人々が、フリーソフトウェアの頒布システムが首尾一貫して適用されているという信頼に基づき、このシステムを通じて頒布される多様なソフトウェアに寛大な貢献をしてきたのは事実であるが、人がどのようなシステムを通じてソフトウェアを頒布したいと思うかはあくまでも作者/寄与者次第であり、あなたが選択を押しつけることはできない。 
+特許やその他の財産権を侵害したり、そのような権利の主張の効力に異議を唱えたりするようあなたを誘惑することがこの節の目的ではない。この節には、人々によってライセンス慣行として実現されてきた、フリーソフトウェア頒布のシステムの完全性を護るという目的しかない。多くの人々が、フリーソフトウェアの頒布システムが首尾一貫して適用されているという信頼に基づき、このシステムを通じて頒布される多様なソフトウェアに寛大な貢献をしてきたのは事実であるが、人がどのようなシステムを通じてソフトウェアを頒布したいと思うかはあくまでも作者/寄与者次第であり、あなたが選択を押しつけることはできない。
 
-この節は、この契約書のこの節以外の部分の一帰結になると考えられるケースを徹底的に明らかにすることを目的としている。 
+この節は、この契約書のこの節以外の部分の一帰結になると考えられるケースを徹底的に明らかにすることを目的としている。
 
-8. 『プログラム』の頒布や利用が、ある国においては特許または著作権が主張されたインターフェースのいずれかによって制限されている場合、『プログラム』にこの契約書を適用した元の著作権者は、そういった国々を排除した明確な地理的頒布制限を加え、そこで排除されていない国の中やそれらの国々の間でのみ頒布が許可されるようにしても構わない。その場合、そのような制限はこの契約書本文で書かれているのと同様に見なされる。 
+8. 『プログラム』の頒布や利用が、ある国においては特許または著作権が主張されたインターフェースのいずれかによって制限されている場合、『プログラム』にこの契約書を適用した元の著作権者は、そういった国々を排除した明確な地理的頒布制限を加え、そこで排除されていない国の中やそれらの国々の間でのみ頒布が許可されるようにしても構わない。その場合、そのような制限はこの契約書本文で書かれているのと同様に見なされる。
 
-9. フリーソフトウェア財団は、時によって改訂または新版の一般公衆利用許諾書を発表することができる。そのような新版は現在のバージョンとその精神においては似たものになるだろうが、新たな問題や懸念を解決するため細部では異なる可能性がある。 
+9. フリーソフトウェア財団は、時によって改訂または新版の一般公衆利用許諾書を発表することができる。そのような新版は現在のバージョンとその精神においては似たものになるだろうが、新たな問題や懸念を解決するため細部では異なる可能性がある。
 
-それぞれのバージョンには、見分けが付くようにバージョン番号が振られている。『プログラム』においてそれに適用されるこの契約書のバージョン番号が指定されていて、更に「それ以降のいかなるバージョン(any later version)」も適用して良いとなっていた場合、あなたは従う条件と制約として、指定のバージョンか、フリーソフトウェア財団によって発行された指定のバージョン以降の版のどれか一つのどちらかを選ぶことが出来る。『プログラム』でライセンスのバージョン番号が指定されていないならば、あなたは今までにフリーソフトウェア財団から発行されたバージョンの中から好きに選んで構わない。 
+それぞれのバージョンには、見分けが付くようにバージョン番号が振られている。『プログラム』においてそれに適用されるこの契約書のバージョン番号が指定されていて、更に「それ以降のいかなるバージョン(any later version)」も適用して良いとなっていた場合、あなたは従う条件と制約として、指定のバージョンか、フリーソフトウェア財団によって発行された指定のバージョン以降の版のどれか一つのどちらかを選ぶことが出来る。『プログラム』でライセンスのバージョン番号が指定されていないならば、あなたは今までにフリーソフトウェア財団から発行されたバージョンの中から好きに選んで構わない。
 
-10. もしあなたが『プログラム』の一部を、その頒布条件がこの契約書と異なる他のフリーなプログラムと統合したいならば、作者に連絡して許可を求めよ。フリーソフトウェア財団が著作権を保有するソフトウェアについては、フリーソフトウェア財団に連絡せよ。私たちは、このような場合のために特別な例外を設けることもある。私たちが決定を下すにあたっては、私たちのフリーソフトウェアの派生物すべてがフリーな状態に保たれるということと、一般的にソフトウェアの共有と再利用を促進するという二つの目標を規準に検討されるであろう。 
+10. もしあなたが『プログラム』の一部を、その頒布条件がこの契約書と異なる他のフリーなプログラムと統合したいならば、作者に連絡して許可を求めよ。フリーソフトウェア財団が著作権を保有するソフトウェアについては、フリーソフトウェア財団に連絡せよ。私たちは、このような場合のために特別な例外を設けることもある。私たちが決定を下すにあたっては、私たちのフリーソフトウェアの派生物すべてがフリーな状態に保たれるということと、一般的にソフトウェアの共有と再利用を促進するという二つの目標を規準に検討されるであろう。
 
 無保証について
 
-11. 『プログラム』は代価無しに利用が許可されるので、適切な法が認める限りにおいて、『プログラム』に関するいかなる保証も存在しない。書面で別に述べる場合を除いて、著作権者、またはその他の団体は、『プログラム』を、表明されたか言外にかは問わず、商業的適性を保証するほのめかしやある特定の目的への適合性(に限られない)を含む一切の保証無しに「あるがまま」で提供する。『プログラム』の質と性能に関するリスクのすべてはあなたに帰属する。『プログラム』に欠陥があると判明した場合、あなたは必要な保守点検や補修、修正に要するコストのすべてを引き受けることになる。 
+11. 『プログラム』は代価無しに利用が許可されるので、適切な法が認める限りにおいて、『プログラム』に関するいかなる保証も存在しない。書面で別に述べる場合を除いて、著作権者、またはその他の団体は、『プログラム』を、表明されたか言外にかは問わず、商業的適性を保証するほのめかしやある特定の目的への適合性(に限られない)を含む一切の保証無しに「あるがまま」で提供する。『プログラム』の質と性能に関するリスクのすべてはあなたに帰属する。『プログラム』に欠陥があると判明した場合、あなたは必要な保守点検や補修、修正に要するコストのすべてを引き受けることになる。
 
-12. 適切な法か書面での同意によって命ぜられない限り、著作権者、または上記で許可されている通りに『プログラム』を改変または再頒布したその他の団体は、あなたに対して『プログラム』の利用ないし利用不能で生じた通常損害や特別損害、偶発損害、間接損害(データの消失や不正確な処理、あなたか第三者が被った損失、あるいは『プログラム』が他のソフトウェアと一緒に動作しないという不具合などを含むがそれらに限らない)に一切の責任を負わない。そのような損害が生ずる可能性について彼らが忠告されていたとしても同様である。 
+12. 適切な法か書面での同意によって命ぜられない限り、著作権者、または上記で許可されている通りに『プログラム』を改変または再頒布したその他の団体は、あなたに対して『プログラム』の利用ないし利用不能で生じた通常損害や特別損害、偶発損害、間接損害(データの消失や不正確な処理、あなたか第三者が被った損失、あるいは『プログラム』が他のソフトウェアと一緒に動作しないという不具合などを含むがそれらに限らない)に一切の責任を負わない。そのような損害が生ずる可能性について彼らが忠告されていたとしても同様である。
 
 
 条件と制約終わり
@@ -144,9 +144,9 @@ You may charge a fee for the physical act of transferring a copy, and you may at
 
 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
 
-a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
-b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
-c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
 
 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
 
@@ -156,9 +156,9 @@ In addition, mere aggregation of another work not based on the Program with the
 
 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
 
-a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
-c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
 
 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
 
@@ -263,8 +263,9 @@ EndOfLicense;
     $lang->about_rewrite = 'Webサーバで「リライト・モジュール（mod_rewrite）」をサポートしている場合は、「http://アドレス/?document_srl=123」のようなアドレスを「http://アドレス/123」のように動的だけど静的なページに見せることができます。';
     $lang->time_zone = 'タイムゾーン';
     $lang->about_time_zone = 'サーバの設定時間とサービスしているローカル時間との差が生じる場合、タイムゾーンを指定すれば、表示時間を指定したところの時間に設定できます。';
-    $lang->qmail_compatibility = 'Qmail 호환';
-    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
+    $lang->qmail_compatibility = 'Qmail 互換';
+    $lang->about_qmail_compatibility = 'Qmail等、CRLFを線区分子で認識できないMTAでメールが発送されるようにします。';
+
 
     $lang->about_database_file = 'Sqliteはファイルにデータを保存します。そのため、データベースファイルにはウェブからアクセスできない場所にしなければなりません。<br/><span style="color:red">データファイルのパーミッションは「707」に設定してください。</span>';
 

From f8c428980f2fa9cc2821c91b6b1011be3d1ecda9 Mon Sep 17 00:00:00 2001
From: chinaskyking <chinaskyking@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 14 May 2008 09:54:00 +0000
Subject: [PATCH 101/111] =?UTF-8?q?qmail=5Fcompatibility=20=EC=98=A4?=
 =?UTF-8?q?=ED=83=80=EC=88=98=EC=A0=95.?=
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@4199 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/jp.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
index 2c00d22b1..f4b3118f2 100644
--- a/modules/install/lang/jp.lang.php
+++ b/modules/install/lang/jp.lang.php
@@ -264,7 +264,7 @@ EndOfLicense;
     $lang->time_zone = 'タイムゾーン';
     $lang->about_time_zone = 'サーバの設定時間とサービスしているローカル時間との差が生じる場合、タイムゾーンを指定すれば、表示時間を指定したところの時間に設定できます。';
     $lang->qmail_compatibility = 'Qmail 互換';
-    $lang->about_qmail_compatibility = 'Qmail等、CRLFを線区分子で認識できないMTAでメールが発送されるようにします。';
+    $lang->about_qmail_compatibility = 'Qmail等、CRLFを改行コードで認識できないMTAでメールが発送されるようにします。';
 
 
     $lang->about_database_file = 'Sqliteはファイルにデータを保存します。そのため、データベースファイルにはウェブからアクセスできない場所にしなければなりません。<br/><span style="color:red">データファイルのパーミッションは「707」に設定してください。</span>';

From 512c8525e6f4a21f454ec1872159af8ea2c70fb2 Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 14 May 2008 15:36:20 +0000
Subject: [PATCH 102/111] =?UTF-8?q?ge=20=EC=B6=94=EA=B0=80=20=ED=95=84?=
 =?UTF-8?q?=EC=9A=94..=20=EC=9A=B0=EC=84=A0=EC=A0=81=EC=9C=BC=EB=A1=9C=20g?=
 =?UTF-8?q?e=20=EC=84=A4=EC=A0=95=EB=A7=8C=20=ED=95=B4=EB=86=93=EC=9D=8C..?=
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@4200 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 layouts/xe_official/conf/info.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/layouts/xe_official/conf/info.xml b/layouts/xe_official/conf/info.xml
index 34673e5ac..557ee27a0 100644
--- a/layouts/xe_official/conf/info.xml
+++ b/layouts/xe_official/conf/info.xml
@@ -3,6 +3,7 @@
     <title xml:lang="ko">ZBXE 공식 사이트 레이아웃</title>
     <title xml:lang="jp">ZBXEオフィシャルレイアウト</title>
     <title xml:lang="en">ZBXE Official website layout</title>
+	<title xml:lang="ge">ZBXE Official website layout</title>
 	<title xml:lang="ru">ZBXE Официальный сайт макет</title>
     <title xml:lang="es">Diseño oficial de la página web de ZBXE</title>
     <title xml:lang="zh-CN">ZBXE 官方网站布局</title>
@@ -10,6 +11,7 @@
         <name xml:lang="ko">zero</name>
         <name xml:lang="jp">Zero</name>
         <name xml:lang="en">zero</name>
+		<name xml:lang="ge">zero</name>
 		<name xml:lang="ru">zero</name>
         <name xml:lang="es">zero</name>
         <name xml:lang="zh-CN">zero</name>
@@ -30,6 +32,12 @@
             Designer : So-Ra Lee
             HTML/CSS : Chan-Myung Jeong
             Layout producer : zero
+        </description>
+	    <description xml:lang="ge">
+            This layout is the Zeroboard XE Official website layout.
+            Designer : So-Ra Lee
+            HTML/CSS : Chan-Myung Jeong
+            Layout producer : zero
         </description>
 		<description xml:lang="ru">
             Этот формат является Zeroboard XE Официальный сайт компоновку. 
@@ -56,18 +64,21 @@
             <title xml:lang="jp">カラーセット</title>
             <title xml:lang="zh-CN">颜色</title>
             <title xml:lang="en">Colorset</title>
+			<title xml:lang="ge">Colorset</title>
 			<title xml:lang="ru">Colorset</title>
             <title xml:lang="es">Set de colores</title>
             <description xml:lang="ko">원하시는 컬러셋을 선택해주세요.</description>
             <description xml:lang="jp">希望するカラーセットを選択してください。</description>
             <description xml:lang="zh-CN">请选择颜色。</description>
             <description xml:lang="en">Please select a colorset you want.</description>
+			<description xml:lang="ge">Please select a colorset you want.</description>
 			<description xml:lang="ru">Выберите colorset хотите.</description>
             <description xml:lang="es">Seleccione set de colores que desea.</description>
             <options name="default">
                 <title xml:lang="ko">기본</title>
                 <title xml:lang="jp">デフォルト</title>
                 <title xml:lang="en">Basic</title>
+				<title xml:lang="ge">Basic</title>
 				<title xml:lang="ru">Базовые</title>
                 <title xml:lang="es">Básico</title>
                 <title xml:lang="zh-CN">默认</title>
@@ -77,6 +88,7 @@
                 <title xml:lang="ko">검은색</title>
                 <title xml:lang="jp">黒</title>
                 <title xml:lang="en">Black</title>
+				<title xml:lang="ge">Black</title>
 				<title xml:lang="ru">Черного</title>
                 <title xml:lang="es">Negro</title>
                 <title xml:lang="zh-CN">黑色</title>
@@ -86,6 +98,7 @@
                 <title xml:lang="ko">하얀색</title>
                 <title xml:lang="jp">白</title>
                 <title xml:lang="en">white</title>
+				<title xml:lang="ge">white</title>
 				<title xml:lang="ru">белый</title>
                 <title xml:lang="es">Blanco</title>
                 <title xml:lang="zh-CN">白色</title>
@@ -103,6 +116,7 @@
             <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力してください。 (縦幅が23pxである透明イメージが最も合います。)</description>
             <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。)</description>
             <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+			<description xml:lang="ge">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
 			<description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
             <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
         </var>
@@ -111,12 +125,14 @@
             <title xml:lang="jp">ホームページURL</title>
             <title xml:lang="zh-CN">主页地址</title>
             <title xml:lang="en">Homepage URL</title>
+			<title xml:lang="ge">Homepage URL</title>
 			<title xml:lang="ru">Домашняя страница URL</title>
             <title xml:lang="es">URL de la página web</title>
             <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
             <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力してください。</description>
             <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
             <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+			<description xml:lang="ge">Please input the URL to redirect when user clicks the logo</description>
 			<description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
             <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
              </var>
@@ -131,6 +147,7 @@
             <description xml:lang="jp">背景イメージを使う場合は、登録してください。</description>
             <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
             <description xml:lang="en">Please input if you want to use background image.</description>
+			<description xml:lang="ge">Please input if you want to use background image.</description>
 			<description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
             <description xml:lang="es">Ingresar imagen de fondo si desea usar.</description>
         </var>
@@ -141,6 +158,7 @@
             <title xml:lang="jp">上段メニュー</title>
             <title xml:lang="zh-CN">主菜单</title>
             <title xml:lang="en">Top menu</title>
+			<title xml:lang="ge">Top menu</title>
 			<title xml:lang="ru">Верхнее меню</title>
             <title xml:lang="es">Menú Principal</title>
             <maxdepth>3</maxdepth>
@@ -150,6 +168,7 @@
             <title xml:lang="jp">下段メニュー</title>
             <title xml:lang="zh-CN">底部菜单</title>
             <title xml:lang="en">Bottom menu</title>
+			<title xml:lang="ge">Bottom menu</title>
 			<title xml:lang="ru">Внизу меню</title>
             <title xml:lang="es">Menú Inferior </title>
             <maxdepth>1</maxdepth>

From 180c08ddce76c0283a28ab7a1b513533ec1f5be5 Mon Sep 17 00:00:00 2001
From: sspa3141 <sspa3141@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 14 May 2008 15:52:39 +0000
Subject: [PATCH 103/111] =?UTF-8?q?1)=20=EB=8F=85=EC=9D=BC=EC=96=B4=20?=
 =?UTF-8?q?=EB=B2=88=EC=97=AD=202)=20lang/=EB=B2=88=EC=97=AD=20=EC=9B=90?=
 =?UTF-8?q?=EB=B3=B8=20-=20ge.lang.php=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=20=20->=20=EB=8F=85=EC=9D=BC=EC=96=B4=20=EC=9E=85?=
 =?UTF-8?q?=EB=A0=A5=ED=9B=84=20=EC=82=AD=EC=A0=9C=20=ED=95=84=EC=9A=94?=
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@4201 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/ge.lang.php             |  18 +-
 common/lang/번역 원본 - ge.lang.php | 249 ++++++++++++++++++++++++++++
 layouts/xe_official/conf/info.xml   |  28 ++--
 3 files changed, 273 insertions(+), 22 deletions(-)
 create mode 100644 common/lang/번역 원본 - ge.lang.php

diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
index 48bf3a5f1..1216f7e89 100644
--- a/common/lang/ge.lang.php
+++ b/common/lang/ge.lang.php
@@ -23,16 +23,16 @@
     $lang->cmd_save = 'Sichern';
     $lang->cmd_load = 'Laden';
     $lang->cmd_input = 'Input';
-	// 여기에서부터 번역 시작필요..
-    $lang->cmd_search = 'Search';
-    $lang->cmd_cancel = 'Cancel';
-    $lang->cmd_back = 'Go Back';
-    $lang->cmd_vote = 'Recommend';
+    $lang->cmd_search = 'Suche';
+    $lang->cmd_cancel = 'Abbrechen';
+    $lang->cmd_back = 'Zurück';
+    $lang->cmd_vote = 'Weiterempfehlen';
     $lang->cmd_vote_down = 'Criticize';
-    $lang->cmd_declare = 'Accuse';
-    $lang->cmd_cancel_declare = 'Cancel Accuse';
-    $lang->cmd_declared_list = 'Accusations List';
-    $lang->cmd_copy = 'Copy';
+    $lang->cmd_declare = 'accuse';
+    $lang->cmd_cancel_declare = 'accuse Abbrechen';
+    $lang->cmd_declared_list = 'Vorwürfe Liste';
+    $lang->cmd_copy = 'Kopieren';
+	// 여기에서부터 번역 시작필요..
     $lang->cmd_move = 'Move';
     $lang->cmd_move_up = 'Up';
     $lang->cmd_move_down = 'Down';
diff --git a/common/lang/번역 원본 - ge.lang.php b/common/lang/번역 원본 - ge.lang.php
new file mode 100644
index 000000000..e19e33eb5
--- /dev/null
+++ b/common/lang/번역 원본 - ge.lang.php	
@@ -0,0 +1,249 @@
+<? php
+     / **
+      * @ Datei common / lang / en.lang.php
+      * @ Author zero (zero@nzeo.com)
+      * @ Kurzen English Language Pack (nur einfache Worte sind hier eingeschlossen)
+      ** /
+
+     // Worte für Aktion, die im Grunde verwendet
+     $lang-> cmd_write = 'Schreiben';
+     $lang-> cmd_reply = 'Antworten';
+     $lang-> cmd_delete = 'Löschen';
+     $lang-> cmd_modify = 'Change';
+     $lang-> cmd_edit = 'Bearbeiten';
+     $lang-> cmd_view = 'Anzeigen';
+     $lang-> cmd_view_all = 'Alle anzeigen';
+     $lang-> cmd_list = 'US -';
+     $lang-> cmd_prev = 'Zurück';
+     $lang-> cmd_next = 'Nächster';
+$ Lang->cmd_send_trackback = 'Trackback senden';
+     $lang-> cmd_registration = $ lang-> cmd_submit = 'Übermitteln';
+     $lang-> cmd_comment_registration = 'Kommentar hinzufügen';
+     $lang-> cmd_insert = 'Legen Sie';
+     $lang-> cmd_save = 'sichern';
+     $lang-> cmd_load = 'Laden';
+     $lang-> cmd_input = 'Input';
+/ / 여기 에서부터 번역 시작 필요 ..
+     $lang-> cmd_search = 'Suche';
+     $lang-> cmd_cancel = 'Abbrechen';
+     $lang-> cmd_back = 'Zurück';
+     $lang-> cmd_vote = 'Weiterempfehlen';
+     $lang-> cmd_vote_down = 'Criticize';
+     $lang-> cmd_declare = 'accuse';
+     $lang-> cmd_cancel_declare = 'accuse Abbrechen';
+     $lang-> cmd_declared_list = 'Vorwürfe Liste';
+     $lang-> cmd_copy = 'Kopieren';
+     $lang-> cmd_move = 'Verschieben';
+     $lang-> cmd_move_up = 'Nach oben';
+     $lang-> cmd_move_down = 'Down';
+     $lang-> cmd_add_indent = 'Einrücken';
+     $lang-> cmd_remove_indent = 'Ausrücken';
+     $lang-> cmd_management = 'Verwaltung';
+     $lang-> cmd_make = 'Erstellen';
+     $lang-> cmd_select = 'Select';
+     $lang-> cmd_select_all = 'Alle auswählen';
+     $lang-> cmd_unselect_all = "Alle abwählen";
+     $lang-> cmd_reverse_all = 'Reverse';
+     $lang-> cmd_close_all = 'Schließen Sie alle';
+     $lang-> cmd_open_all = 'Open All';
+     $lang-> cmd_reload = "Reload";
+     $lang-> cmd_close = 'Schließen';
+     $lang-> cmd_open = 'Open';
+     $lang-> cmd_setup = 'Konfiguration';
+     $lang-> cmd_addition_setup = 'Zusätzliche Setup ';
+     $lang->cmd_option = 'Option';
+     $lang-> cmd_apply = 'Übernehmen';
+     $lang-> cmd_open_calendar = 'Wählen Sie ein Datum';
+     $lang-> cmd_send = 'Senden';
+     $lang-> cmd_print = 'Drucken';
+     $lang-> cmd_scrap = 'Schrott';
+     $lang-> cmd_preview = 'Vorschau';
+     $lang-> cmd_reset = 'Reset';
+     $lang-> cmd_remake_cache = "Re-Cache-Datei erstellen";
+     $lang-> cmd_publish = "Veröffentlichen";
+     $lang-> cmd_layout_setup = 'Konfiguration Layout';
+     $lang-> cmd_layout_edit = 'Layout bearbeiten';
+
+     $lang-> enable = "Aktivieren";
+     $lang-> deaktivieren = 'Deaktivieren';
+
+     // Essential Words
+     $lang-> nein = 'Nein';
+     $lang-> Hinweis = 'Hinweis';
+     $lang-> geheim = "Geheim";
+     $lang-> category = $ lang-> category_srl = 'Kategorie';
+     $lang-> document_srl = 'Doc. No ';
+     $lang-> user_id = 'User-ID';
+     $lang-> Autor = 'Entwickler';
+     $lang-> password = 'Passwort';
+     $lang-> password1 = 'Passwort';
+     $lang-> password2 = 'Passwort bestätigen';
+     $lang-> admin_id = 'Admin ID';
+     $lang-> writer = 'Autor';
+     $lang-> user_name = 'Username';
+     $lang-> nick_name = 'Nick Name';
+     $lang-> email_address = 'E-Mail';
+     $lang-> Homepage = 'Startseite';
+     $lang-> Blog = 'Blog';
+     $lang-> Geburtstag = 'Geburtstag';
+     $lang-> browser_title = 'Browser-Titel';
+     $lang-> title = 'Betreff';
+     $lang-> title_content = 'Betreff + Inhalt';
+     $lang-> topic = 'Thema';
+     $lang-> Antworten = 'Antwort';
+     $lang-> content = "Inhalt";
+     $lang-> Dokument = 'Artikel';
+     $lang-> comment = 'Kommentar';
+     $lang-> description = 'Beschreibung';
+     $lang-> trackback = 'Trackback';
+     $lang-> tag = 'Tag';
+     $lang-> allow_comment = 'Kommentare erlauben';
+     $lang-> lock_comment = 'Block Kommentare';
+     $lang-> allow_trackback = 'Allow Trackbacks';
+     $lang-> uploaded_file = 'Anlage';
+     $lang-> Zuschuss = 'Erlaubnis';
+     $lang-> target = 'target';
+     $lang-> total = 'Gesamt';
+     $lang-> total_count = 'count Gesamt';
+     $lang-> ipadresse = 'IP-Adresse';
+     $lang-> path = 'Pfad';
+     $lang-> Warenkorb = 'Ausgewählte Posten';
+     $lang-> Freund = 'Freunde';
+     $lang-> notify = 'Meldung';
+     $lang-> order_target = 'Ausrichten Target';
+     $lang-> order_type = 'Sortieren Typ';
+     $lang-> order_asc = 'Aufstieg';
+     $lang-> order_desc = 'Abstieg';
+     $lang-> mid = 'Module Name';
+     $lang-> Layout = 'Layout';
+     $lang-> Widget = "Widget";
+     $lang-> module = 'Modul';
+     $lang-> Haut = 'Thema';
+     $lang-> colorset = 'Colorset';
+     $lang-> extra_vars = 'Extra Vars';
+
+     $lang-> document_url = 'Artikel-URL';
+     $lang-> trackback_url = 'Trackback-URL';
+     $lang-> blog_name = 'Blog-Titel';
+     $lang-> Auszug = 'Zitat';
+
+     $lang-> document_count = 'Total Artikel';
+     $lang-> page_count = 'Page Count';
+     $lang-> list_count = 'US-Count ';
+     $lang-> search_list_count = 'Suchen US-Count';
+     $lang-> readed_count = 'Views';
+     $lang-> voted_count = 'Stimmen';
+     $lang-> comment_count = 'Kommentare';
+     $lang-> member_count = 'Mitglied Count';
+     $lang-> date = 'Datum';
+     $lang-> regdate = 'Anmeldungsdatum Datum';
+     $lang-> last_update = 'Letzte Aktualisierung';
+     $lang-> last_post = 'Letzter Beitrag';
+     $lang-> signup_date = 'Join Date';
+     $lang-> last_login = "Letzter Login";
+     $lang-> first_page = 'Erste Seite';
+     $lang-> last_page = 'Letzte Seite';
+     $lang-> search_target = 'Target für die Google-Suche';
+     $lang-> search_keyword = 'Stichwort';
+     $lang-> is_default = 'Standard';
+
+     $lang-> no_documents = 'Keine Artikel';
+
+	 $lang-> board_manager = 'Board';
+     $lang-> member_manager = 'Mitglied';
+     $lang-> layout_manager = 'Layout-Einstellungen';
+
+     $lang-> Nutzung = 'Use';
+     $lang-> notuse = 'nicht verwenden';
+     $lang-> not_exists = "nicht vorhanden";
+
+     $lang-> public = 'öffentlich';
+     $lang-> private = 'private';
+
+     $lang-> unit_sec = 's';
+     $lang-> unit_min = 'mindestens';
+     $lang-> unit_hour = 'h';
+     $lang-> unit_day = 'th';
+     $lang-> unit_week = 'Woche';
+     $lang-> unit_month = "Monat";
+     $lang-> unit_year = 'Jahr';
+
+     // Beschreibungen
+     $lang-> about_tag = 'Sie können mehrere Tags, indem Sie ein Komma (,) zwischen den einzelnen Tag';
+     $lang-> about_layout = 'Layouts schmücken das Aussehen Ihrer Module. Sie können sie von Layout-Menü am oberen Rand ';
+
+     // Messages
+     $lang-> msg_call_server = 'Anfordern an den Server, bitte warten';
+     $lang-> msg_db_not_setted = 'DB-Konfiguration wurde nicht festgelegt ';
+     $lang-> msg_invalid_queryid = 'spezifiziert Abfrage ID-Wert ist ungültig';
+     $lang-> msg_not_permitted = 'Sie haben keine Berechtigung zum Zugriff auf';
+     $lang-> msg_input_password = 'Bitte geben Sie das Passwort';
+     $lang-> msg_invalid_document = 'Ungültige Article Number';
+     $lang-> msg_invalid_request = 'Invalid request ';
+     $lang-> msg_invalid_password = 'Ungültiges Passwort';
+     $lang-> msg_error_occured = 'Ein Fehler ist aufgetreten ';
+     $lang-> msg_not_founded = 'Target konnte nicht gefunden werden';
+     $lang-> msg_no_result = 'Nichts gefunden';
+
+     $lang-> msg_not_permitted_act = 'Sie haben keine Berechtigung zur Ausführung angeforderte Aktion';
+     $lang-> msg_module_is_not_exists = 'Gewünschte Modul konnte nicht gefunden werden';
+     $lang-> msg_module_is_not_standalone = 'Gewünschte Modul kann nicht ausgeführt werden unabhängig';
+
+     $lang-> success_registed = 'Anmeldungsdatum';
+     $lang-> success_declared = 'Accused erfolgreich';
+     $lang-> success_updated = 'erfolgreich aktualisiert';
+     $lang-> success_deleted = 'erfolgreich gelöscht';
+     $lang-> success_voted = 'Empfohlen';
+     $lang-> success_blamed = 'Schuld success_blamed';
+     $lang-> success_moved = 'Umzug';
+     $lang-> success_sended = 'Gesendet';
+     $lang-> success_reset = 'Reset';
+     $lang-> success_leaved = 'Alle Mitglieder Daten wurden komplett gestrichen. '
+     $lang-> success_saved = 'erfolgreich gespeichert ';
+
+     $lang-> fail_to_delete = 'konnte nicht gelöscht werden';
+     $lang-> fail_to_move = 'konnte nicht verschoben werden';
+
+     $lang-> failed_voted = 'konnte nicht empfehlen';
+     $lang-> failed_blamed = 'Es konnte keine Schuld';
+     $lang-> failed_declared = 'Konnte nicht vorwerfen';
+     $lang-> fail_to_delete_have_children = 'Bitte versuchen Sie es erneut nach dem Entfernen erste Antworten';
+
+     $lang-> confirm_submit = 'Sind Sie sicher, dass zur Vorlage? ';
+     $lang-> confirm_logout = 'Sind Sie sicher, dass nach Logout? ';
+     $lang-> confirm_vote = 'Sind Sie sicher, dass zu empfehlen? ';
+     $lang-> CONFIRM_DELETE = 'Sind Sie sicher, dass löschen? ';
+     $lang-> confirm_move = 'Sind Sie sicher, dass zu bewegen? ';
+     $lang-> confirm_reset = 'Sind Sie sicher, dass zurücksetzen? ';
+     $lang-> confirm_leave = 'Sind Sie sicher, dass zu verlassen? ';
+
+     $lang-> column_type = 'Spaltenart';
+     $lang-> column_type_list [ 'Text'] = 'ein Online-Text';
+     $lang-> column_type_list [ 'Homepage'] = 'url';
+     $lang-> column_type_list [ 'email_address'] =' E-Mail ';
+     $lang-> column_type_list [ 'tel'] = 'Telefonnummer';
+     $lang-> column_type_list [ 'textarea'] = 'Multi-line textarea';
+     $lang-> column_type_list [ 'Checkbox'] = 'Checkbox (multiple Auswahl)';
+     $lang-> column_type_list [ 'Select'] = "select box (Einzel-Auswahl) ';
+     $lang-> column_type_list [ 'kr_zip'] = 'Postleitzahl (Koreanisch) ";
+     $lang-> column_type_list [ 'date'] = 'Datum (jjjj / mm / dd)';
+     // $ lang-> column_type_list [ 'jp_zip'] = 'Postleitzahl (Japanisch)';
+     $lang-> column_name = 'Spaltenname';
+     $lang-> column_title = 'Spaltentitel';
+     $lang-> default_value = 'Standardwert';
+     $lang-> is_active = 'Aktiv';
+     $lang-> is_required = "Pflichtfeld";
+
+     // Alert Nachrichten für JavaScript unter Verwendung von XML-Filter
+     $lang-> Filter-> isnull = 'Bitte geben Sie einen Wert für% s';
+     $lang-> Filter-> outofrange = 'Bitte richten Sie die Textlänge von% s';
+     $lang-> Filter-> equalto = "Der Wert von% s ist ungültig";
+     $lang-> Filter-> invalid_email = "Das Format von% s ist ungültig. ex) zbxe@zeroboard.com";
+     $lang-> Filter-> invalid_user_id = $ lang-> Filter-> invalid_userid = "Das Format von% s ist ungültig. \ \ Nall Werte sollte aus Alphabet, Zahlen oder Unterstrich (_) und den ersten Buchstaben sollten Alphabet" ;
+     $lang-> Filter-> invalid_homepage = "Das Format von% s ist ungültig. ex) http://www.zeroboard.com";
+     $lang-> Filter-> invalid_korean = "Das Format von% s ist ungültig. Koreanisch Bitte geben Sie nur";
+     $lang-> Filter-> invalid_korean_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Koreanisch oder Zahlen";
+     $lang-> Filter-> invalid_alpha = "Das Format von% s ist ungültig. Bitte geben Sie nur Alphabete";
+     $lang-> Filter-> invalid_alpha_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Alphabete oder Zahlen";
+     $lang-> Filter-> invalid_number = "Das Format von% s ist ungültig. Bitte geben Sie nur Zahlen";
+?>
\ No newline at end of file
diff --git a/layouts/xe_official/conf/info.xml b/layouts/xe_official/conf/info.xml
index 557ee27a0..cac06e112 100644
--- a/layouts/xe_official/conf/info.xml
+++ b/layouts/xe_official/conf/info.xml
@@ -3,7 +3,7 @@
     <title xml:lang="ko">ZBXE 공식 사이트 레이아웃</title>
     <title xml:lang="jp">ZBXEオフィシャルレイアウト</title>
     <title xml:lang="en">ZBXE Official website layout</title>
-	<title xml:lang="ge">ZBXE Official website layout</title>
+	<title xml:lang="ge">ZBXE Offizielle Website-Layout</title>
 	<title xml:lang="ru">ZBXE Официальный сайт макет</title>
     <title xml:lang="es">Diseño oficial de la página web de ZBXE</title>
     <title xml:lang="zh-CN">ZBXE 官方网站布局</title>
@@ -34,10 +34,10 @@
             Layout producer : zero
         </description>
 	    <description xml:lang="ge">
-            This layout is the Zeroboard XE Official website layout.
-            Designer : So-Ra Lee
-            HTML/CSS : Chan-Myung Jeong
-            Layout producer : zero
+            Dieses Layout ist das Zeroboard XE Offizielle Website-Layout.
+             Designer: So-Ra Lee
+             HTML / CSS: Chan-Myung Jeong
+             Layout Hersteller: Zero
         </description>
 		<description xml:lang="ru">
             Этот формат является Zeroboard XE Официальный сайт компоновку. 
@@ -71,7 +71,7 @@
             <description xml:lang="jp">希望するカラーセットを選択してください。</description>
             <description xml:lang="zh-CN">请选择颜色。</description>
             <description xml:lang="en">Please select a colorset you want.</description>
-			<description xml:lang="ge">Please select a colorset you want.</description>
+			<description xml:lang="ge">Bitte wählen Sie ein colorset Sie wollen.</description>
 			<description xml:lang="ru">Выберите colorset хотите.</description>
             <description xml:lang="es">Seleccione set de colores que desea.</description>
             <options name="default">
@@ -88,7 +88,7 @@
                 <title xml:lang="ko">검은색</title>
                 <title xml:lang="jp">黒</title>
                 <title xml:lang="en">Black</title>
-				<title xml:lang="ge">Black</title>
+				<title xml:lang="ge">Schwarz</title>
 				<title xml:lang="ru">Черного</title>
                 <title xml:lang="es">Negro</title>
                 <title xml:lang="zh-CN">黑色</title>
@@ -98,7 +98,7 @@
                 <title xml:lang="ko">하얀색</title>
                 <title xml:lang="jp">白</title>
                 <title xml:lang="en">white</title>
-				<title xml:lang="ge">white</title>
+				<title xml:lang="ge">weiß</title>
 				<title xml:lang="ru">белый</title>
                 <title xml:lang="es">Blanco</title>
                 <title xml:lang="zh-CN">白色</title>
@@ -110,13 +110,14 @@
             <title xml:lang="jp">ロゴイメージ</title>
             <title xml:lang="zh-CN">LOGO图片</title>
             <title xml:lang="en">Logo image</title>
+			<title xml:lang="ge">Logobildes</title>
 			<title xml:lang="ru">Изображения логотипа</title>
             <title xml:lang="es">Imagen del logotipo</title>
             <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
             <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力してください。 (縦幅が23pxである透明イメージが最も合います。)</description>
             <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。)</description>
             <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
-			<description xml:lang="ge">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+			<description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
 			<description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
             <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
         </var>
@@ -132,7 +133,7 @@
             <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力してください。</description>
             <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
             <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
-			<description xml:lang="ge">Please input the URL to redirect when user clicks the logo</description>
+			<description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
 			<description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
             <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
              </var>
@@ -141,13 +142,14 @@
             <title xml:lang="jp">背景イメージ</title>
             <title xml:lang="zh-CN">背景图片</title>
             <title xml:lang="en">Background Image</title>
+			<title xml:lang="ge">Hintergrundbild</title>
 			<title xml:lang="ru">Фоновое изображение</title>
 		    <title xml:lang="es">Imagen de fondo</title>
             <description xml:lang="ko">배경 이미지를 사용하시려면 등록해주세요.</description>
             <description xml:lang="jp">背景イメージを使う場合は、登録してください。</description>
             <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
             <description xml:lang="en">Please input if you want to use background image.</description>
-			<description xml:lang="ge">Please input if you want to use background image.</description>
+			<description xml:lang="ge">Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild.</description>
 			<description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
             <description xml:lang="es">Ingresar imagen de fondo si desea usar.</description>
         </var>
@@ -158,7 +160,7 @@
             <title xml:lang="jp">上段メニュー</title>
             <title xml:lang="zh-CN">主菜单</title>
             <title xml:lang="en">Top menu</title>
-			<title xml:lang="ge">Top menu</title>
+			<title xml:lang="ge">Top Menü</title>
 			<title xml:lang="ru">Верхнее меню</title>
             <title xml:lang="es">Menú Principal</title>
             <maxdepth>3</maxdepth>
@@ -168,7 +170,7 @@
             <title xml:lang="jp">下段メニュー</title>
             <title xml:lang="zh-CN">底部菜单</title>
             <title xml:lang="en">Bottom menu</title>
-			<title xml:lang="ge">Bottom menu</title>
+			<title xml:lang="ge">Bottom-Menü</title>
 			<title xml:lang="ru">Внизу меню</title>
             <title xml:lang="es">Menú Inferior </title>
             <maxdepth>1</maxdepth>

From 7c6af7c616e40ddf7ac8fb899b6e4320f24ebc96 Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 14 May 2008 22:40:02 +0000
Subject: [PATCH 104/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=B6=84=20=EB=B2=88=EC=97=AD=20=EB=B0=8F=20?=
 =?UTF-8?q?=EA=B8=B0=EC=A1=B4=EB=B2=88=EC=97=AD=20=EC=88=98=EC=A0=95.?=
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@4202 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/lang/zh-CN.lang.php      | 2 +-
 modules/point/lang/zh-CN.lang.php      | 4 ++--
 modules/spamfilter/lang/zh-CN.lang.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/board/lang/zh-CN.lang.php b/modules/board/lang/zh-CN.lang.php
index 40fb9a936..eabfa0bf8 100644
--- a/modules/board/lang/zh-CN.lang.php
+++ b/modules/board/lang/zh-CN.lang.php
@@ -38,7 +38,7 @@
     $lang->about_layout_setup = '可直接编辑博客布局代码。可以把控件代码插入到您喜欢的位置。';
     $lang->about_board_category = '可以添加/删除分类项<br />分类有异常情况时，可以尝试重新生成缓冲文件。';
     $lang->about_except_notice = "设置公告目录项不再重复显示到普通目录当中。";
-    $lang->about_board = "可生成，管理版面的模块。\n生成版面后，点击模块名即可对其详细设置。";
+    $lang->about_board = "可生成/管理版面的模块。\n生成版面后点击模块名即可对其详细设置。";
     $lang->about_consultation = "咨询功能是指除有管理权限的会员以外，其他会员只能浏览自己发表的主题。\n使用咨询功能时系统将自动禁止非会员的发表主题权限。";
     $lang->about_admin_mail = '有新的主题或评论时，将自动发电子邮件来通知管理员。<br />多数电子邮件由逗号(,)来分隔。';
 ?>
diff --git a/modules/point/lang/zh-CN.lang.php b/modules/point/lang/zh-CN.lang.php
index 378a64c2d..ed145000d 100644
--- a/modules/point/lang/zh-CN.lang.php
+++ b/modules/point/lang/zh-CN.lang.php
@@ -48,8 +48,8 @@
     $lang->point_delete_file = '删除文件';
     $lang->point_download_file = '下载文件 (图片除外)';
     $lang->point_read_document = '查看主题';
-    $lang->point_voted = '추천 받음';
-    $lang->point_blamed = '비추천 받음';
+    $lang->point_voted = '推荐';
+    $lang->point_blamed = '反对';
 
 
     $lang->cmd_point_config = '基本设置';
diff --git a/modules/spamfilter/lang/zh-CN.lang.php b/modules/spamfilter/lang/zh-CN.lang.php
index 2db5834b9..b9138a59b 100644
--- a/modules/spamfilter/lang/zh-CN.lang.php
+++ b/modules/spamfilter/lang/zh-CN.lang.php
@@ -14,7 +14,7 @@
     $lang->denied_ip = "禁止IP";
     $lang->interval = "处理垃圾间隔";
     $lang->limit_count = "限制数";
-    $lang->check_trackback = "引用检查";
+    $lang->check_trackback = "检查引用";
     $lang->word = "单词";
 
     // 说明文
@@ -22,7 +22,7 @@
     $lang->about_limit_count = "在指定时间内发表的新主题超过限制数时，系统将把它认为是垃圾主题，将自动禁止对方的IP。";
     $lang->about_denied_ip = "禁止IP可以使用通配符。(如：如 \"127.0.*.*\"）";
     $lang->about_denied_word = "登录为敏感词，可以对要发表的主题进行检测并禁止含有敏感词的主题发表。";
-    $lang->about_check_trackback = "在一个主题中只对一个IP允许引用。";
+    $lang->about_check_trackback = "对一个主题只允许一个IP引用。";
 
     // 提示信息
     $lang->msg_alert_limited_by_config = '%s秒之内不能连续发表新主题。如您继续再试系统将自动禁止您的IP。';

From 3f0ec628c935031efc7c2fc7612360f50c63362c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 15 May 2008 00:54:24 +0000
Subject: [PATCH 105/111] =?UTF-8?q?=EB=8F=85=EC=9D=BC=EC=96=B4=20=EB=B2=88?=
 =?UTF-8?q?=EC=97=AD=EB=B3=B8=20=EC=A0=95=EB=A6=AC?=
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@4203 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/ge.lang.php             | 355 ++++++++++++++--------------
 common/lang/번역 원본 - ge.lang.php | 249 -------------------
 2 files changed, 177 insertions(+), 427 deletions(-)
 delete mode 100644 common/lang/번역 원본 - ge.lang.php

diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
index 1216f7e89..2d6029039 100644
--- a/common/lang/ge.lang.php
+++ b/common/lang/ge.lang.php
@@ -1,26 +1,26 @@
 <?php
     /**
-     * @file   common/lang/en.lang.php
-     * @author zero (zero@nzeo.com)
-     * @brief  English Language Pack (Only basic words are included here)
+     * @Datei common / lang / en.lang.php
+     * @Author zero (zero@nzeo.com)
+     * @Kurzen English Language Pack (nur einfache Worte sind hier eingeschlossen)
      **/
 
-    // words for action, which is basically used
+    // Worte für Aktion, die im Grunde verwendet
     $lang->cmd_write = 'Schreiben';
     $lang->cmd_reply = 'Antworten';
     $lang->cmd_delete = 'Löschen';
-    $lang->cmd_modify = 'Ändern';
+    $lang->cmd_modify = 'Change';
     $lang->cmd_edit = 'Bearbeiten';
     $lang->cmd_view = 'Anzeigen';
     $lang->cmd_view_all = 'Alle anzeigen';
     $lang->cmd_list = 'US -';
     $lang->cmd_prev = 'Zurück';
     $lang->cmd_next = 'Nächster';
-	$lang->cmd_send_trackback = 'Trackback senden';
+    $lang->cmd_send_trackback = 'Trackback senden';
     $lang->cmd_registration = $lang->cmd_submit = 'Übermitteln';
     $lang->cmd_comment_registration = 'Kommentar hinzufügen';
     $lang->cmd_insert = 'Legen Sie';
-    $lang->cmd_save = 'Sichern';
+    $lang->cmd_save = 'sichern';
     $lang->cmd_load = 'Laden';
     $lang->cmd_input = 'Input';
     $lang->cmd_search = 'Suche';
@@ -32,219 +32,218 @@
     $lang->cmd_cancel_declare = 'accuse Abbrechen';
     $lang->cmd_declared_list = 'Vorwürfe Liste';
     $lang->cmd_copy = 'Kopieren';
-	// 여기에서부터 번역 시작필요..
-    $lang->cmd_move = 'Move';
-    $lang->cmd_move_up = 'Up';
+    $lang->cmd_move = 'Verschieben';
+    $lang->cmd_move_up = 'Nach oben';
     $lang->cmd_move_down = 'Down';
-    $lang->cmd_add_indent = 'Indent';
-    $lang->cmd_remove_indent = 'Outdent';
-    $lang->cmd_management = 'Manage';
-    $lang->cmd_make = 'Create';
+    $lang->cmd_add_indent = 'Einrücken';
+    $lang->cmd_remove_indent = 'Ausrücken';
+    $lang->cmd_management = 'Verwaltung';
+    $lang->cmd_make = 'Erstellen';
     $lang->cmd_select = 'Select';
-    $lang->cmd_select_all = 'Select All';
-    $lang->cmd_unselect_all = 'Deselect All';
+    $lang->cmd_select_all = 'Alle auswählen';
+    $lang->cmd_unselect_all = "Alle abwählen";
     $lang->cmd_reverse_all = 'Reverse';
-    $lang->cmd_close_all = 'Close All';
+    $lang->cmd_close_all = 'Schließen Sie alle';
     $lang->cmd_open_all = 'Open All';
-    $lang->cmd_reload = 'Reload';
-    $lang->cmd_close = 'Close';
+    $lang->cmd_reload = "Reload";
+    $lang->cmd_close = 'Schließen';
     $lang->cmd_open = 'Open';
-    $lang->cmd_setup = 'Configure';
-    $lang->cmd_addition_setup = 'Additional Setup';
-	$lang->cmd_option = 'Option';
-    $lang->cmd_apply = 'Apply';
-    $lang->cmd_open_calendar = 'Select a Date';
-    $lang->cmd_send = 'Send';
-    $lang->cmd_print = 'Print';
-    $lang->cmd_scrap = 'Scrap';
-    $lang->cmd_preview = 'Preview';
+    $lang->cmd_setup = 'Konfiguration';
+    $lang->cmd_addition_setup = 'Zusätzliche Setup ';
+    $lang->cmd_option = 'Option';
+    $lang->cmd_apply = 'Übernehmen';
+    $lang->cmd_open_calendar = 'Wählen Sie ein Datum';
+    $lang->cmd_send = 'Senden';
+    $lang->cmd_print = 'Drucken';
+    $lang->cmd_scrap = 'Schrott';
+    $lang->cmd_preview = 'Vorschau';
     $lang->cmd_reset = 'Reset';
-    $lang->cmd_remake_cache = "Re-create cache file";
-    $lang->cmd_publish = "Publish";
-    $lang->cmd_layout_setup = 'Configure layout';
-    $lang->cmd_layout_edit = 'Edit layout';
+    $lang->cmd_remake_cache = "Re-Cache-Datei erstellen";
+    $lang->cmd_publish = "Veröffentlichen";
+    $lang->cmd_layout_setup = 'Konfiguration Layout';
+    $lang->cmd_layout_edit = 'Layout bearbeiten';
 
-    $lang->enable = 'Enable';
-    $lang->disable = 'Disable';
+    $lang->enable = "Aktivieren";
+    $lang->deaktivieren = 'Deaktivieren';
 
     // Essential Words
-    $lang->no = 'No.';
-    $lang->notice = 'Notice';
-    $lang->secret = 'Secret';
-    $lang->category = $lang->category_srl = 'Category';
-    $lang->document_srl = 'Doc. No.';
-    $lang->user_id = 'User ID';
-    $lang->author = 'Developer';
-    $lang->password = 'Password';
-    $lang->password1 = 'Password';
-    $lang->password2 = 'Confirm Password';
+    $lang->no = 'Nein';
+    $lang->notice = 'Hinweis';
+    $lang->secret = "Geheim";
+    $lang->category = $lang->category_srl = 'Kategorie';
+    $lang->document_srl = 'Doc. No ';
+    $lang->user_id = 'User-ID';
+    $lang->author = 'Entwickler';
+    $lang->password = 'Passwort';
+    $lang->password1 = 'Passwort';
+    $lang->password2 = 'Passwort bestätigen';
     $lang->admin_id = 'Admin ID';
-    $lang->writer = 'Author';
-    $lang->user_name = 'User Name';
+    $lang->writer = 'Autor';
+    $lang->user_name = 'Username';
     $lang->nick_name = 'Nick Name';
-    $lang->email_address = 'Email';
-    $lang->homepage = 'Homepage';
+    $lang->email_address = 'E-Mail';
+    $lang->homepage = 'Startseite';
     $lang->blog = 'Blog';
-    $lang->birthday = 'Birthday';
-    $lang->browser_title = 'Browser Title';
-    $lang->title = 'Subject';
-    $lang->title_content = 'Subject+Content';
-    $lang->topic = 'Topic';
-    $lang->replies = 'Reply';
-    $lang->content = 'Content';
-    $lang->document = 'Article';
-    $lang->comment = 'Comment';
-    $lang->description = 'Description';
+    $lang->birthday = 'Geburtstag';
+    $lang->browser_title = 'Browser-Titel';
+    $lang->title = 'Betreff';
+    $lang->title_content = 'Betreff + Inhalt';
+    $lang->topic = 'Thema';
+    $lang->replies = 'Antwort';
+    $lang->content = "Inhalt";
+    $lang->document = 'Artikel';
+    $lang->comment = 'Kommentar';
+    $lang->description = 'Beschreibung';
     $lang->trackback = 'Trackback';
     $lang->tag = 'Tag';
-    $lang->allow_comment = 'Allow Comments';
-    $lang->lock_comment = 'Block Comments';
+    $lang->allow_comment = 'Kommentare erlauben';
+    $lang->lock_comment = 'Block Kommentare';
     $lang->allow_trackback = 'Allow Trackbacks';
-    $lang->uploaded_file = 'Attachment';
-    $lang->grant = 'Permission';
-    $lang->target = 'Target';
-    $lang->total = 'Total';
-    $lang->total_count = 'Count Total';
-    $lang->ipaddress = 'IP Address';
-    $lang->path = 'Path';
-    $lang->cart = 'Selected Item';
-    $lang->friend = 'Friends';
-    $lang->notify = 'Notification';
-    $lang->order_target = 'Align Target';
-    $lang->order_type = 'Sorting Type';
-    $lang->order_asc = 'ascend';
-    $lang->order_desc = 'descend';
+    $lang->uploaded_file = 'Anlage';
+    $lang->grant = 'Erlaubnis';
+    $lang->target = 'target';
+    $lang->total = 'Gesamt';
+    $lang->total_count = 'count Gesamt';
+    $lang->ipaddress = 'IP-Adresse';
+    $lang->path = 'Pfad';
+    $lang->cart = 'Ausgewählte Posten';
+    $lang->friend = 'Freunde';
+    $lang->notify = 'Meldung';
+    $lang->order_target = 'Ausrichten Target';
+    $lang->order_type = 'Sortieren Typ';
+    $lang->order_asc = 'Aufstieg';
+    $lang->order_desc = 'Abstieg';
 
     $lang->mid = 'Module Name';
     $lang->layout = 'Layout';
-    $lang->widget = 'Widget';
-    $lang->module = 'Module';
-    $lang->skin = 'Theme';
+    $lang->widget = "Widget";
+    $lang->module = 'Modul';
+    $lang->skin = 'Thema';
     $lang->colorset = 'Colorset';
     $lang->extra_vars = 'Extra Vars';
 
-    $lang->document_url = 'Article URL';
-    $lang->trackback_url = 'Trackback URL';
-    $lang->blog_name = 'Blog Title';
-    $lang->excerpt = 'Quotation';
+    $lang->document_url = 'Artikel-URL';
+    $lang->trackback_url = 'Trackback-URL';
+    $lang->blog_name = 'Blog-Titel';
+    $lang->excerpt = 'Zitat';
 
-    $lang->document_count = 'Total Articles';
+    $lang->document_count = 'Total Artikel';
     $lang->page_count = 'Page Count';
-    $lang->list_count = 'List Count';
-    $lang->search_list_count = 'Search List Count';
+    $lang->list_count = 'US-Count ';
+    $lang->search_list_count = 'Suchen US-Count';
     $lang->readed_count = 'Views';
-    $lang->voted_count = 'Votes';
-    $lang->comment_count = 'Comments';
-    $lang->member_count = 'Member Count';
-    $lang->date = 'Date';
-    $lang->regdate = 'Registered Date';
-    $lang->last_update = 'Last Update';
-    $lang->last_post = 'Last Post';
+    $lang->voted_count = 'Stimmen';
+    $lang->comment_count = 'Kommentare';
+    $lang->member_count = 'Mitglied Count';
+    $lang->date = 'Datum';
+    $lang->regdate = 'Anmeldungsdatum Datum';
+    $lang->last_update = 'Letzte Aktualisierung';
+    $lang->last_post = 'Letzter Beitrag';
     $lang->signup_date = 'Join Date';
-    $lang->last_login = 'Last Login';
-    $lang->first_page = 'First Page';
-    $lang->last_page = 'Last Page';
-    $lang->search_target = 'Target for Search';
-    $lang->search_keyword = 'Keyword';
-    $lang->is_default = 'Default';
+    $lang->last_login = "Letzter Login";
+    $lang->first_page = 'Erste Seite';
+    $lang->last_page = 'Letzte Seite';
+    $lang->search_target = 'Target für die Google-Suche';
+    $lang->search_keyword = 'Stichwort';
+    $lang->is_default = 'Standard';
 
-    $lang->no_documents = 'No Articles';
+    $lang->no_documents = 'Keine Artikel';
 
-    $lang->board_manager = 'Board Settings';
-    $lang->member_manager = 'Member Settings';
-    $lang->layout_manager = 'Layout Settings';
+    $lang->board_manager = 'Board';
+    $lang->member_manager = 'Mitglied';
+    $lang->layout_manager = 'Layout-Einstellungen';
 
     $lang->use = 'Use';
-    $lang->notuse = 'Not use';
-    $lang->not_exists = "Doesn't exist";
+    $lang->notuse = 'nicht verwenden';
+    $lang->not_exists = "nicht vorhanden";
 
-    $lang->public = 'public';
+    $lang->public = 'öffentlich';
     $lang->private = 'private';
 
-    $lang->unit_sec = 'sec';
-    $lang->unit_min = 'min';
-    $lang->unit_hour = 'hr';
+    $lang->unit_sec = 's';
+    $lang->unit_min = 'mindestens';
+    $lang->unit_hour = 'h';
     $lang->unit_day = 'th';
-    $lang->unit_week = 'week';
-    $lang->unit_month = 'month';
-    $lang->unit_year = 'year';
+    $lang->unit_week = 'Woche';
+    $lang->unit_month = "Monat";
+    $lang->unit_year = 'Jahr';
 
-    // Descriptions
-    $lang->about_tag = 'You may submit multiple tags by inserting commas(,) between each tag';
-    $lang->about_layout = 'Layouts decorate the appearance of your modules. you can configure them from Layout menu on the top';
+    // Beschreibungen
+    $lang->about_tag = 'Sie können mehrere Tags, indem Sie ein Komma (,) zwischen den einzelnen Tag';
+    $lang->about_layout = 'Layouts schmücken das Aussehen Ihrer Module. Sie können sie von Layout-Menü am oberen Rand ';
 
     // Messages
-    $lang->msg_call_server = 'Requesting to the server, please wait';
-    $lang->msg_db_not_setted = 'DB configuration has not been set';
-    $lang->msg_invalid_queryid = 'Specified query ID value is invalid';
-    $lang->msg_not_permitted = 'You do not have permission to access';
-    $lang->msg_input_password = 'Please input the password';
-    $lang->msg_invalid_document = 'Invalid Article Number';
-    $lang->msg_invalid_request = 'Invalid Request';
-    $lang->msg_invalid_password = 'Invalid Password';
-    $lang->msg_error_occured = 'An error has occured';
-    $lang->msg_not_founded = 'Target could not be found';
-    $lang->msg_no_result = 'Nothing found';
+    $lang->msg_call_server = 'Anfordern an den Server, bitte warten';
+    $lang->msg_db_not_setted = 'DB-Konfiguration wurde nicht festgelegt ';
+    $lang->msg_invalid_queryid = 'spezifiziert Abfrage ID-Wert ist ungültig';
+    $lang->msg_not_permitted = 'Sie haben keine Berechtigung zum Zugriff auf';
+    $lang->msg_input_password = 'Bitte geben Sie das Passwort';
+    $lang->msg_invalid_document = 'Ungültige Article Number';
+    $lang->msg_invalid_request = 'Invalid request ';
+    $lang->msg_invalid_password = 'Ungültiges Passwort';
+    $lang->msg_error_occured = 'Ein Fehler ist aufgetreten ';
+    $lang->msg_not_founded = 'Target konnte nicht gefunden werden';
+    $lang->msg_no_result = 'Nichts gefunden';
 
-    $lang->msg_not_permitted_act = 'You do not have permission to execute requested action';
-    $lang->msg_module_is_not_exists = 'Requested module could not be found';
-    $lang->msg_module_is_not_standalone = 'Requested module cannot be executed independently';
+    $lang->msg_not_permitted_act = 'Sie haben keine Berechtigung zur Ausführung angeforderte Aktion';
+    $lang->msg_module_is_not_exists = 'Gewünschte Modul konnte nicht gefunden werden';
+    $lang->msg_module_is_not_standalone = 'Gewünschte Modul kann nicht ausgeführt werden unabhängig';
 
-    $lang->success_registed = 'Registered successfully';
-    $lang->success_declared = 'Accused successfully';
-    $lang->success_updated = 'Updated successfully';
-    $lang->success_deleted = 'Deleted successfully';
-    $lang->success_voted = 'Recommended successfully';
-    $lang->success_blamed = 'Blamed success_blamed';
-    $lang->success_moved = 'Moved successfully';
-    $lang->success_sended = 'Sent successfully';
-    $lang->success_reset = 'Reset successfully';
-    $lang->success_leaved = 'All member data have been deleted completely.';
-    $lang->success_saved = 'Saved successfully';
+    $lang->success_registed = 'Anmeldungsdatum';
+    $lang->success_declared = 'Accused erfolgreich';
+    $lang->success_updated = 'erfolgreich aktualisiert';
+    $lang->success_deleted = 'erfolgreich gelöscht';
+    $lang->success_voted = 'Empfohlen';
+    $lang->success_blamed = 'Schuld success_blamed';
+    $lang->success_moved = 'Umzug';
+    $lang->success_sended = 'Gesendet';
+    $lang->success_reset = 'Reset';
+    $lang->success_leaved = 'Alle Mitglieder Daten wurden komplett gestrichen. ';
+    $lang->success_saved = 'erfolgreich gespeichert ';
 
-    $lang->fail_to_delete = 'Could not be deleted';
-    $lang->fail_to_move = 'Could not be moved';
+    $lang->fail_to_delete = 'konnte nicht gelöscht werden';
+    $lang->fail_to_move = 'konnte nicht verschoben werden';
 
-    $lang->failed_voted = 'Could not recommend';
-    $lang->failed_blamed = 'Could not blame';
-    $lang->failed_declared = 'Could not accuse';
-    $lang->fail_to_delete_have_children = 'Please try again after removing replies first';
+    $lang->failed_voted = 'konnte nicht empfehlen';
+    $lang->failed_blamed = 'Es konnte keine Schuld';
+    $lang->failed_declared = 'Konnte nicht vorwerfen';
+    $lang->fail_to_delete_have_children = 'Bitte versuchen Sie es erneut nach dem Entfernen erste Antworten';
 
-    $lang->confirm_submit = 'Are you sure to submit?';
-    $lang->confirm_logout = 'Are you sure to logout?';
-    $lang->confirm_vote = 'Are you sure to recommend?';
-    $lang->confirm_delete = 'Are you sure to delete?';
-    $lang->confirm_move = 'Are you sure to move?';
-    $lang->confirm_reset = 'Are you sure to reset?';
-    $lang->confirm_leave = 'Are you sure to leave?';
+    $lang->confirm_submit = 'Sind Sie sicher, dass zur Vorlage? ';
+    $lang->confirm_logout = 'Sind Sie sicher, dass nach Logout? ';
+    $lang->confirm_vote = 'Sind Sie sicher, dass zu empfehlen? ';
+    $lang->CONFIRM_DELETE = 'Sind Sie sicher, dass löschen? ';
+    $lang->confirm_move = 'Sind Sie sicher, dass zu bewegen? ';
+    $lang->confirm_reset = 'Sind Sie sicher, dass zurücksetzen? ';
+    $lang->confirm_leave = 'Sind Sie sicher, dass zu verlassen? ';
 
-    $lang->column_type = 'Column Type';
-    $lang->column_type_list['text'] = 'one-line text';
+    $lang->column_type = 'Spaltenart';
+    $lang->column_type_list['text'] = 'ein Online-Text';
     $lang->column_type_list['homepage'] = 'url';
-    $lang->column_type_list['email_address'] = 'email';
-    $lang->column_type_list['tel'] = 'phone number';
-    $lang->column_type_list['textarea'] = 'multi-line textarea';
-    $lang->column_type_list['checkbox'] = 'checkbox (multiple selection)';
-    $lang->column_type_list['select'] = 'select box (single selection)';
-    $lang->column_type_list['kr_zip'] = 'zip code (Korean)';
-    $lang->column_type_list['date'] = 'date (yyyy/mm/dd)';
-    //$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
-    $lang->column_name = 'Column Name';
-    $lang->column_title = 'Column Title';
-    $lang->default_value = 'Default Value';
-    $lang->is_active = 'Active';
-    $lang->is_required = 'Required Field';
+    $lang->column_type_list['email_address'] =' E-Mail ';
+    $lang->column_type_list['tel'] = 'Telefonnummer';
+    $lang->column_type_list['textarea'] = 'Multi-line textarea';
+    $lang->column_type_list['checkbox'] = 'Checkbox (multiple Auswahl)';
+    $lang->column_type_list['select'] = "select box (Einzel-Auswahl) ';
+    $lang->column_type_list['kr_zip'] = 'Postleitzahl (Koreanisch) ";
+    $lang->column_type_list['date'] = 'Datum (jjjj / mm / dd)';
+    // $lang->column_type_list [ 'jp_zip'] = 'Postleitzahl (Japanisch)';
+    $lang->column_name = 'Spaltenname';
+    $lang->column_title = 'Spaltentitel';
+    $lang->default_value = 'Standardwert';
+    $lang->is_active = 'Aktiv';
+    $lang->is_required = "Pflichtfeld";
 
-    // Alert messages for Javascript using by XML filter
-    $lang->filter->isnull = 'Please input a value for %s';
-    $lang->filter->outofrange = 'Please align the text length of %s';
-    $lang->filter->equalto = "The value of %s is invalid";
-    $lang->filter->invalid_email = "The format of %s is invalid. ex) zbxe@zeroboard.com";
-    $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "The format of %s is invalid.\\nAll values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet";
-    $lang->filter->invalid_homepage = "The format of %s is invalid. ex) http://www.zeroboard.com";
-    $lang->filter->invalid_korean = "The format of %s is invalid. Please input Korean only";
-    $lang->filter->invalid_korean_number = "The format of %s is invalid. Please input Korean or numbers";
-    $lang->filter->invalid_alpha = "The format of %s is invalid. Please input alphabets only";
-    $lang->filter->invalid_alpha_number = "The format of %s is invalid. Please input alphabets or numbers";
-    $lang->filter->invalid_number = "The format of %s is invalid. Please input numbers only";
+    // Alert Nachrichten für JavaScript unter Verwendung von XML-Filter
+    $lang->filter->isnull = 'Bitte geben Sie einen Wert für% s';
+    $lang->filter->outofrange = 'Bitte richten Sie die Textlänge von% s';
+    $lang->filter->equalto = "Der Wert von% s ist ungültig";
+    $lang->filter->invalid_email = "Das Format von% s ist ungültig. ex) zbxe@zeroboard.com";
+    $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "Das Format von% s ist ungültig. \ \ Nall Werte sollte aus Alphabet, Zahlen oder Unterstrich (_) und den ersten Buchstaben sollten Alphabet" ;
+    $lang->filter->invalid_homepage = "Das Format von% s ist ungültig. ex) http://www.zeroboard.com";
+    $lang->filter->invalid_korean = "Das Format von% s ist ungültig. Koreanisch Bitte geben Sie nur";
+    $lang->filter->invalid_korean_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Koreanisch oder Zahlen";
+    $lang->filter->invalid_alpha = "Das Format von% s ist ungültig. Bitte geben Sie nur Alphabete";
+    $lang->filter->invalid_alpha_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Alphabete oder Zahlen";
+    $lang->filter->invalid_number = "Das Format von% s ist ungültig. Bitte geben Sie nur Zahlen";
 ?>
diff --git a/common/lang/번역 원본 - ge.lang.php b/common/lang/번역 원본 - ge.lang.php
deleted file mode 100644
index e19e33eb5..000000000
--- a/common/lang/번역 원본 - ge.lang.php	
+++ /dev/null
@@ -1,249 +0,0 @@
-<? php
-     / **
-      * @ Datei common / lang / en.lang.php
-      * @ Author zero (zero@nzeo.com)
-      * @ Kurzen English Language Pack (nur einfache Worte sind hier eingeschlossen)
-      ** /
-
-     // Worte für Aktion, die im Grunde verwendet
-     $lang-> cmd_write = 'Schreiben';
-     $lang-> cmd_reply = 'Antworten';
-     $lang-> cmd_delete = 'Löschen';
-     $lang-> cmd_modify = 'Change';
-     $lang-> cmd_edit = 'Bearbeiten';
-     $lang-> cmd_view = 'Anzeigen';
-     $lang-> cmd_view_all = 'Alle anzeigen';
-     $lang-> cmd_list = 'US -';
-     $lang-> cmd_prev = 'Zurück';
-     $lang-> cmd_next = 'Nächster';
-$ Lang->cmd_send_trackback = 'Trackback senden';
-     $lang-> cmd_registration = $ lang-> cmd_submit = 'Übermitteln';
-     $lang-> cmd_comment_registration = 'Kommentar hinzufügen';
-     $lang-> cmd_insert = 'Legen Sie';
-     $lang-> cmd_save = 'sichern';
-     $lang-> cmd_load = 'Laden';
-     $lang-> cmd_input = 'Input';
-/ / 여기 에서부터 번역 시작 필요 ..
-     $lang-> cmd_search = 'Suche';
-     $lang-> cmd_cancel = 'Abbrechen';
-     $lang-> cmd_back = 'Zurück';
-     $lang-> cmd_vote = 'Weiterempfehlen';
-     $lang-> cmd_vote_down = 'Criticize';
-     $lang-> cmd_declare = 'accuse';
-     $lang-> cmd_cancel_declare = 'accuse Abbrechen';
-     $lang-> cmd_declared_list = 'Vorwürfe Liste';
-     $lang-> cmd_copy = 'Kopieren';
-     $lang-> cmd_move = 'Verschieben';
-     $lang-> cmd_move_up = 'Nach oben';
-     $lang-> cmd_move_down = 'Down';
-     $lang-> cmd_add_indent = 'Einrücken';
-     $lang-> cmd_remove_indent = 'Ausrücken';
-     $lang-> cmd_management = 'Verwaltung';
-     $lang-> cmd_make = 'Erstellen';
-     $lang-> cmd_select = 'Select';
-     $lang-> cmd_select_all = 'Alle auswählen';
-     $lang-> cmd_unselect_all = "Alle abwählen";
-     $lang-> cmd_reverse_all = 'Reverse';
-     $lang-> cmd_close_all = 'Schließen Sie alle';
-     $lang-> cmd_open_all = 'Open All';
-     $lang-> cmd_reload = "Reload";
-     $lang-> cmd_close = 'Schließen';
-     $lang-> cmd_open = 'Open';
-     $lang-> cmd_setup = 'Konfiguration';
-     $lang-> cmd_addition_setup = 'Zusätzliche Setup ';
-     $lang->cmd_option = 'Option';
-     $lang-> cmd_apply = 'Übernehmen';
-     $lang-> cmd_open_calendar = 'Wählen Sie ein Datum';
-     $lang-> cmd_send = 'Senden';
-     $lang-> cmd_print = 'Drucken';
-     $lang-> cmd_scrap = 'Schrott';
-     $lang-> cmd_preview = 'Vorschau';
-     $lang-> cmd_reset = 'Reset';
-     $lang-> cmd_remake_cache = "Re-Cache-Datei erstellen";
-     $lang-> cmd_publish = "Veröffentlichen";
-     $lang-> cmd_layout_setup = 'Konfiguration Layout';
-     $lang-> cmd_layout_edit = 'Layout bearbeiten';
-
-     $lang-> enable = "Aktivieren";
-     $lang-> deaktivieren = 'Deaktivieren';
-
-     // Essential Words
-     $lang-> nein = 'Nein';
-     $lang-> Hinweis = 'Hinweis';
-     $lang-> geheim = "Geheim";
-     $lang-> category = $ lang-> category_srl = 'Kategorie';
-     $lang-> document_srl = 'Doc. No ';
-     $lang-> user_id = 'User-ID';
-     $lang-> Autor = 'Entwickler';
-     $lang-> password = 'Passwort';
-     $lang-> password1 = 'Passwort';
-     $lang-> password2 = 'Passwort bestätigen';
-     $lang-> admin_id = 'Admin ID';
-     $lang-> writer = 'Autor';
-     $lang-> user_name = 'Username';
-     $lang-> nick_name = 'Nick Name';
-     $lang-> email_address = 'E-Mail';
-     $lang-> Homepage = 'Startseite';
-     $lang-> Blog = 'Blog';
-     $lang-> Geburtstag = 'Geburtstag';
-     $lang-> browser_title = 'Browser-Titel';
-     $lang-> title = 'Betreff';
-     $lang-> title_content = 'Betreff + Inhalt';
-     $lang-> topic = 'Thema';
-     $lang-> Antworten = 'Antwort';
-     $lang-> content = "Inhalt";
-     $lang-> Dokument = 'Artikel';
-     $lang-> comment = 'Kommentar';
-     $lang-> description = 'Beschreibung';
-     $lang-> trackback = 'Trackback';
-     $lang-> tag = 'Tag';
-     $lang-> allow_comment = 'Kommentare erlauben';
-     $lang-> lock_comment = 'Block Kommentare';
-     $lang-> allow_trackback = 'Allow Trackbacks';
-     $lang-> uploaded_file = 'Anlage';
-     $lang-> Zuschuss = 'Erlaubnis';
-     $lang-> target = 'target';
-     $lang-> total = 'Gesamt';
-     $lang-> total_count = 'count Gesamt';
-     $lang-> ipadresse = 'IP-Adresse';
-     $lang-> path = 'Pfad';
-     $lang-> Warenkorb = 'Ausgewählte Posten';
-     $lang-> Freund = 'Freunde';
-     $lang-> notify = 'Meldung';
-     $lang-> order_target = 'Ausrichten Target';
-     $lang-> order_type = 'Sortieren Typ';
-     $lang-> order_asc = 'Aufstieg';
-     $lang-> order_desc = 'Abstieg';
-     $lang-> mid = 'Module Name';
-     $lang-> Layout = 'Layout';
-     $lang-> Widget = "Widget";
-     $lang-> module = 'Modul';
-     $lang-> Haut = 'Thema';
-     $lang-> colorset = 'Colorset';
-     $lang-> extra_vars = 'Extra Vars';
-
-     $lang-> document_url = 'Artikel-URL';
-     $lang-> trackback_url = 'Trackback-URL';
-     $lang-> blog_name = 'Blog-Titel';
-     $lang-> Auszug = 'Zitat';
-
-     $lang-> document_count = 'Total Artikel';
-     $lang-> page_count = 'Page Count';
-     $lang-> list_count = 'US-Count ';
-     $lang-> search_list_count = 'Suchen US-Count';
-     $lang-> readed_count = 'Views';
-     $lang-> voted_count = 'Stimmen';
-     $lang-> comment_count = 'Kommentare';
-     $lang-> member_count = 'Mitglied Count';
-     $lang-> date = 'Datum';
-     $lang-> regdate = 'Anmeldungsdatum Datum';
-     $lang-> last_update = 'Letzte Aktualisierung';
-     $lang-> last_post = 'Letzter Beitrag';
-     $lang-> signup_date = 'Join Date';
-     $lang-> last_login = "Letzter Login";
-     $lang-> first_page = 'Erste Seite';
-     $lang-> last_page = 'Letzte Seite';
-     $lang-> search_target = 'Target für die Google-Suche';
-     $lang-> search_keyword = 'Stichwort';
-     $lang-> is_default = 'Standard';
-
-     $lang-> no_documents = 'Keine Artikel';
-
-	 $lang-> board_manager = 'Board';
-     $lang-> member_manager = 'Mitglied';
-     $lang-> layout_manager = 'Layout-Einstellungen';
-
-     $lang-> Nutzung = 'Use';
-     $lang-> notuse = 'nicht verwenden';
-     $lang-> not_exists = "nicht vorhanden";
-
-     $lang-> public = 'öffentlich';
-     $lang-> private = 'private';
-
-     $lang-> unit_sec = 's';
-     $lang-> unit_min = 'mindestens';
-     $lang-> unit_hour = 'h';
-     $lang-> unit_day = 'th';
-     $lang-> unit_week = 'Woche';
-     $lang-> unit_month = "Monat";
-     $lang-> unit_year = 'Jahr';
-
-     // Beschreibungen
-     $lang-> about_tag = 'Sie können mehrere Tags, indem Sie ein Komma (,) zwischen den einzelnen Tag';
-     $lang-> about_layout = 'Layouts schmücken das Aussehen Ihrer Module. Sie können sie von Layout-Menü am oberen Rand ';
-
-     // Messages
-     $lang-> msg_call_server = 'Anfordern an den Server, bitte warten';
-     $lang-> msg_db_not_setted = 'DB-Konfiguration wurde nicht festgelegt ';
-     $lang-> msg_invalid_queryid = 'spezifiziert Abfrage ID-Wert ist ungültig';
-     $lang-> msg_not_permitted = 'Sie haben keine Berechtigung zum Zugriff auf';
-     $lang-> msg_input_password = 'Bitte geben Sie das Passwort';
-     $lang-> msg_invalid_document = 'Ungültige Article Number';
-     $lang-> msg_invalid_request = 'Invalid request ';
-     $lang-> msg_invalid_password = 'Ungültiges Passwort';
-     $lang-> msg_error_occured = 'Ein Fehler ist aufgetreten ';
-     $lang-> msg_not_founded = 'Target konnte nicht gefunden werden';
-     $lang-> msg_no_result = 'Nichts gefunden';
-
-     $lang-> msg_not_permitted_act = 'Sie haben keine Berechtigung zur Ausführung angeforderte Aktion';
-     $lang-> msg_module_is_not_exists = 'Gewünschte Modul konnte nicht gefunden werden';
-     $lang-> msg_module_is_not_standalone = 'Gewünschte Modul kann nicht ausgeführt werden unabhängig';
-
-     $lang-> success_registed = 'Anmeldungsdatum';
-     $lang-> success_declared = 'Accused erfolgreich';
-     $lang-> success_updated = 'erfolgreich aktualisiert';
-     $lang-> success_deleted = 'erfolgreich gelöscht';
-     $lang-> success_voted = 'Empfohlen';
-     $lang-> success_blamed = 'Schuld success_blamed';
-     $lang-> success_moved = 'Umzug';
-     $lang-> success_sended = 'Gesendet';
-     $lang-> success_reset = 'Reset';
-     $lang-> success_leaved = 'Alle Mitglieder Daten wurden komplett gestrichen. '
-     $lang-> success_saved = 'erfolgreich gespeichert ';
-
-     $lang-> fail_to_delete = 'konnte nicht gelöscht werden';
-     $lang-> fail_to_move = 'konnte nicht verschoben werden';
-
-     $lang-> failed_voted = 'konnte nicht empfehlen';
-     $lang-> failed_blamed = 'Es konnte keine Schuld';
-     $lang-> failed_declared = 'Konnte nicht vorwerfen';
-     $lang-> fail_to_delete_have_children = 'Bitte versuchen Sie es erneut nach dem Entfernen erste Antworten';
-
-     $lang-> confirm_submit = 'Sind Sie sicher, dass zur Vorlage? ';
-     $lang-> confirm_logout = 'Sind Sie sicher, dass nach Logout? ';
-     $lang-> confirm_vote = 'Sind Sie sicher, dass zu empfehlen? ';
-     $lang-> CONFIRM_DELETE = 'Sind Sie sicher, dass löschen? ';
-     $lang-> confirm_move = 'Sind Sie sicher, dass zu bewegen? ';
-     $lang-> confirm_reset = 'Sind Sie sicher, dass zurücksetzen? ';
-     $lang-> confirm_leave = 'Sind Sie sicher, dass zu verlassen? ';
-
-     $lang-> column_type = 'Spaltenart';
-     $lang-> column_type_list [ 'Text'] = 'ein Online-Text';
-     $lang-> column_type_list [ 'Homepage'] = 'url';
-     $lang-> column_type_list [ 'email_address'] =' E-Mail ';
-     $lang-> column_type_list [ 'tel'] = 'Telefonnummer';
-     $lang-> column_type_list [ 'textarea'] = 'Multi-line textarea';
-     $lang-> column_type_list [ 'Checkbox'] = 'Checkbox (multiple Auswahl)';
-     $lang-> column_type_list [ 'Select'] = "select box (Einzel-Auswahl) ';
-     $lang-> column_type_list [ 'kr_zip'] = 'Postleitzahl (Koreanisch) ";
-     $lang-> column_type_list [ 'date'] = 'Datum (jjjj / mm / dd)';
-     // $ lang-> column_type_list [ 'jp_zip'] = 'Postleitzahl (Japanisch)';
-     $lang-> column_name = 'Spaltenname';
-     $lang-> column_title = 'Spaltentitel';
-     $lang-> default_value = 'Standardwert';
-     $lang-> is_active = 'Aktiv';
-     $lang-> is_required = "Pflichtfeld";
-
-     // Alert Nachrichten für JavaScript unter Verwendung von XML-Filter
-     $lang-> Filter-> isnull = 'Bitte geben Sie einen Wert für% s';
-     $lang-> Filter-> outofrange = 'Bitte richten Sie die Textlänge von% s';
-     $lang-> Filter-> equalto = "Der Wert von% s ist ungültig";
-     $lang-> Filter-> invalid_email = "Das Format von% s ist ungültig. ex) zbxe@zeroboard.com";
-     $lang-> Filter-> invalid_user_id = $ lang-> Filter-> invalid_userid = "Das Format von% s ist ungültig. \ \ Nall Werte sollte aus Alphabet, Zahlen oder Unterstrich (_) und den ersten Buchstaben sollten Alphabet" ;
-     $lang-> Filter-> invalid_homepage = "Das Format von% s ist ungültig. ex) http://www.zeroboard.com";
-     $lang-> Filter-> invalid_korean = "Das Format von% s ist ungültig. Koreanisch Bitte geben Sie nur";
-     $lang-> Filter-> invalid_korean_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Koreanisch oder Zahlen";
-     $lang-> Filter-> invalid_alpha = "Das Format von% s ist ungültig. Bitte geben Sie nur Alphabete";
-     $lang-> Filter-> invalid_alpha_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Alphabete oder Zahlen";
-     $lang-> Filter-> invalid_number = "Das Format von% s ist ungültig. Bitte geben Sie nur Zahlen";
-?>
\ No newline at end of file

From dd71a5eb4f6b9967d60b294b52a6c3c3375cff39 Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 16 May 2008 01:40:53 +0000
Subject: [PATCH 106/111] =?UTF-8?q?=ED=86=B5=ED=95=A9=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20=EB=AA=A8=EB=93=88=EC=97=90=EC=84=9C=20html=20=ED=83=9C?=
 =?UTF-8?q?=EA=B7=B8=EB=A1=9C=20=EA=B2=80=EC=83=89=EC=8B=9C=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=EA=B2=B0=EA=B3=BC=EC=97=90=20=ED=8A=B9=EC=88=98?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=B2=98=EB=A6=AC=20=ED=9B=84=20=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20(#4?=
 =?UTF-8?q?75)?=
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@4204 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/integration_search/integration_search.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php
index 2eed02981..26da2ebaf 100644
--- a/modules/integration_search/integration_search.view.php
+++ b/modules/integration_search/integration_search.view.php
@@ -90,7 +90,7 @@
 			if(Context::getLangType()=='en')
 				$result_text = sprintf(Context::getLang("is_result_text"), $output->total_count, $is_keyword);
 			else
-				$result_text = sprintf(Context::getLang("is_result_text"), $is_keyword, $output->total_count);
+				$result_text = sprintf(Context::getLang("is_result_text"), htmlspecialchars($is_keyword, ENT_NOQUOTES, 'UTF-8'), $output->total_count);
             Context::set('result_text', $result_text);
             Context::set('mid_list', $mid_list);
 

From a6d34426cf0d68a904addaf8226ed06f8ed209f3 Mon Sep 17 00:00:00 2001
From: mmx900 <mmx900@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 16 May 2008 01:43:55 +0000
Subject: [PATCH 107/111] =?UTF-8?q?r4204=20=EC=97=90=EC=84=9C=20=EB=B9=A0?=
 =?UTF-8?q?=EC=A7=84=20=EB=B6=80=EB=B6=84(=EC=98=81=EB=AC=B8=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=EC=97=90=EC=84=9C=20=EC=B2=98=EB=A6=AC)=20=EC=B6=94?=
 =?UTF-8?q?=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@4205 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/integration_search/integration_search.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php
index 26da2ebaf..c30b4ecf4 100644
--- a/modules/integration_search/integration_search.view.php
+++ b/modules/integration_search/integration_search.view.php
@@ -88,7 +88,7 @@
 
             // 텍스트 생성
 			if(Context::getLangType()=='en')
-				$result_text = sprintf(Context::getLang("is_result_text"), $output->total_count, $is_keyword);
+				$result_text = sprintf(Context::getLang("is_result_text"), $output->total_count, htmlspecialchars($is_keyword, ENT_NOQUOTES, 'UTF-8'));
 			else
 				$result_text = sprintf(Context::getLang("is_result_text"), htmlspecialchars($is_keyword, ENT_NOQUOTES, 'UTF-8'), $output->total_count);
             Context::set('result_text', $result_text);

From 33716d7083ee53fbe4291a85968cef2291d8032b Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 16 May 2008 03:34:35 +0000
Subject: [PATCH 108/111] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20UI=20?=
 =?UTF-8?q?=EC=9D=B4=EC=83=81=ED=95=9C=20=EB=B6=80=EB=B6=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
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@4206 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/en.lang.php                              | 1 +
 common/lang/es.lang.php                              | 1 +
 common/lang/fr.lang.php                              | 1 +
 common/lang/ge.lang.php                              | 1 +
 common/lang/jp.lang.php                              | 1 +
 common/lang/ko.lang.php                              | 1 +
 common/lang/ru.lang.php                              | 1 +
 common/lang/zh-CN.lang.php                           | 1 +
 modules/addon/tpl/setup_addon.html                   | 2 +-
 modules/editor/tpl/setup_component.html              | 2 +-
 modules/member/tpl/header.html                       | 4 ++--
 modules/opage/tpl/index.html                         | 2 +-
 modules/widget/tpl/widget_generate_code.html         | 2 +-
 modules/widget/tpl/widget_generate_code_in_page.html | 2 ++
 14 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php
index 45a8334aa..8a5934b90 100644
--- a/common/lang/en.lang.php
+++ b/common/lang/en.lang.php
@@ -71,6 +71,7 @@
     $lang->notice = 'Notice';
     $lang->secret = 'Secret';
     $lang->category = $lang->category_srl = 'Category';
+    $lang->none_category = 'None category';
     $lang->document_srl = 'Doc. No.';
     $lang->user_id = 'User ID';
     $lang->author = 'Developer';
diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php
index 406d8733a..11864cf1c 100644
--- a/common/lang/es.lang.php
+++ b/common/lang/es.lang.php
@@ -70,6 +70,7 @@
     $lang->notice = 'Aviso';
     $lang->secret = 'Secreto';
     $lang->category = $lang->category_srl = 'Categoría';
+    $lang->none_category = '분류없음';
     $lang->document_srl = 'Número del documento';
     $lang->user_id = 'Usuario';
     $lang->author = 'Autor';
diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php
index 32012011b..1cae84b4e 100644
--- a/common/lang/fr.lang.php
+++ b/common/lang/fr.lang.php
@@ -71,6 +71,7 @@
     $lang->notice = 'Notice';
     $lang->secret = 'Secret';
     $lang->category = $lang->category_srl = 'Catégorie';
+    $lang->none_category = 'None category';
     $lang->document_srl = 'Numéro de série du Document';
     $lang->user_id = 'Compte';
     $lang->author = 'Auteur';
diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
index 2d6029039..baa9790ca 100644
--- a/common/lang/ge.lang.php
+++ b/common/lang/ge.lang.php
@@ -71,6 +71,7 @@
     $lang->notice = 'Hinweis';
     $lang->secret = "Geheim";
     $lang->category = $lang->category_srl = 'Kategorie';
+    $lang->none_category = '분류없음';
     $lang->document_srl = 'Doc. No ';
     $lang->user_id = 'User-ID';
     $lang->author = 'Entwickler';
diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php
index 66312fbd8..1d320aa23 100644
--- a/common/lang/jp.lang.php
+++ b/common/lang/jp.lang.php
@@ -71,6 +71,7 @@
     $lang->notice = 'お知らせ';
     $lang->secret = '非公開';
     $lang->category = $lang->category_srl = 'カテゴリ';
+    $lang->none_category = 'None category';
     $lang->document_srl = '書き込み番号';
     $lang->user_id = 'ユーザＩＤ';
     $lang->author = '作者';
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index bdc77a95e..e6e289b5c 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -71,6 +71,7 @@
     $lang->notice = '공지';
     $lang->secret = '비밀';
     $lang->category = $lang->category_srl = '분류';
+    $lang->none_category = '분류 없음';
     $lang->document_srl = '문서번호';
     $lang->user_id = '아이디';
     $lang->author = '작성자';
diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php
index ad5692f56..83e0b4c25 100644
--- a/common/lang/ru.lang.php
+++ b/common/lang/ru.lang.php
@@ -71,6 +71,7 @@
     $lang->notice = 'Уведомление';
     $lang->secret = 'Секрет';
     $lang->category = $lang->category_srl = 'Категория';
+    $lang->none_category = 'None category';
     $lang->document_srl = 'Док. No.';
     $lang->user_id = 'Юзер ID';
     $lang->author = 'Разработчик';
diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
index a5ab90742..e21f0a053 100644
--- a/common/lang/zh-CN.lang.php
+++ b/common/lang/zh-CN.lang.php
@@ -71,6 +71,7 @@
     $lang->notice = '公告';
     $lang->secret = '密帖';
     $lang->category = $lang->category_srl = '分类';
+    $lang->none_category = 'None category';
     $lang->document_srl = '文章编号';
     $lang->user_id = '用户名';
     $lang->author = '制作';
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html
index bffbb436f..af0c7f410 100644
--- a/modules/addon/tpl/setup_addon.html
+++ b/modules/addon/tpl/setup_addon.html
@@ -78,7 +78,7 @@
                     <!--@if($modules->title)-->
                         {$modules->title}
                     <!--@else-->
-                        &nbsp;
+                        {$lang->none_category}
                     <!--@end-->
                     </div>
 
diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html
index be77be537..a10773e30 100644
--- a/modules/editor/tpl/setup_component.html
+++ b/modules/editor/tpl/setup_component.html
@@ -60,7 +60,7 @@
                     <!--@if($modules->title)-->
                         {$modules->title}
                     <!--@else-->
-                        &nbsp;
+                        {$lang->none_category}
                     <!--@end-->
                     </div>
 
diff --git a/modules/member/tpl/header.html b/modules/member/tpl/header.html
index b41057f61..f3e6d6b3d 100644
--- a/modules/member/tpl/header.html
+++ b/modules/member/tpl/header.html
@@ -8,8 +8,8 @@
 <div class="header4">
 <!-- 정보 -->
     <!--@if($total_count)-->
-    <div class="summary">
-        <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <em>{number_format($page)}/{number_format($total_page)}</em>
+    <div class="tableSummaryType1">
+        Total <strong>{number_format($total_count)}</strong>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
     </div>
     <!--@end-->
 
diff --git a/modules/opage/tpl/index.html b/modules/opage/tpl/index.html
index ecca7eb10..4b233d268 100644
--- a/modules/opage/tpl/index.html
+++ b/modules/opage/tpl/index.html
@@ -3,7 +3,7 @@
 
 <!-- 정보 -->
 <div class="tableSummaryType1">
-    Total <strong>{number_format($total_count)}</strong>, Opage <strong>{number_format($opage)}</strong>/{number_format($total_opage)}
+    Total <strong>{number_format($total_count)}</strong>, page <strong>{number_format($opage)}</strong>/{number_format($total_opage)}
 </div>
 
 <!-- 목록 -->
diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html
index 88d0d2cd4..1b0899769 100644
--- a/modules/widget/tpl/widget_generate_code.html
+++ b/modules/widget/tpl/widget_generate_code.html
@@ -85,7 +85,7 @@
                         <!--@if($modules->title)-->
                             <div class="widget_title">{$modules->title}</div>
                         <!--@else-->
-                            <div class="widget_title">&nbsp;</div>
+                            <div class="widget_title">{$lang->none_category}</div>
                         <!--@end-->
 
                         <!--@foreach($modules->list as $key => $val)-->
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index 9fe406b9b..c105d5bc4 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -96,6 +96,8 @@
                     <!--@foreach($mid_list as $module_category_srl => $modules)-->
                         <!--@if($modules->title)-->
                             <div class="widget_title">{$modules->title}</div>
+                        <!--@else-->
+                            <div class="widget_title">{$lang->none_category}</div>
                         <!--@end-->
 
                         <!--@foreach($modules->list as $key => $val)-->

From 2ae3b0e54d33f77eba26b979472fcdd21bef568f Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Fri, 16 May 2008 03:56:08 +0000
Subject: [PATCH 109/111] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=B6=84=20-=20=EB=B0=B0=ED=8F=AC=EC=A0=84?=
 =?UTF-8?q?=20=EB=A7=88=EC=A7=80=EB=A7=89=20=EB=B2=88=EC=97=AD.?=
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@4207 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/lang/zh-CN.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
index e21f0a053..56e32c792 100644
--- a/common/lang/zh-CN.lang.php
+++ b/common/lang/zh-CN.lang.php
@@ -71,7 +71,7 @@
     $lang->notice = '公告';
     $lang->secret = '密帖';
     $lang->category = $lang->category_srl = '分类';
-    $lang->none_category = 'None category';
+    $lang->none_category = '无分类';
     $lang->document_srl = '文章编号';
     $lang->user_id = '用户名';
     $lang->author = '制作';

From 73b676ad3209207d1c776aa684a0882ddcc2de01 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 16 May 2008 04:37:39 +0000
Subject: [PATCH 110/111] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=95=A0=EB=93=9C?=
 =?UTF-8?q?=EC=98=A8=20=ED=99=9C=EC=84=B1=ED=99=94=20=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9D=84=20=EB=B3=80=EA=B2=BD(=EC=9E=90=EB=8F=99=EB=A7=81?=
 =?UTF-8?q?=ED=81=AC,=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EC=9E=90=EB=8F=99=20?=
 =?UTF-8?q?=EB=A6=AC=EC=82=AC=EC=9D=B4=EC=A6=88=20=ED=99=9C=EC=84=B1?=
 =?UTF-8?q?=ED=99=94),=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=EC=9D=98=20=EC=86=8C?=
 =?UTF-8?q?=EC=86=8D=20=EB=AA=A8=EB=93=88=EC=9D=B4=20=EB=8B=A4=EB=A5=B4?=
 =?UTF-8?q?=EA=B2=8C=20=EC=A0=91=EA=B7=BC=EC=8B=9C=20=EC=A0=91=EA=B7=BC=20?=
 =?UTF-8?q?=EA=B8=88=EC=A7=80=20=EC=8B=9C=ED=82=B4?=
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@4208 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/addon/addon.class.php            | 4 +++-
 modules/board/board.admin.controller.php | 2 +-
 modules/board/board.view.php             | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php
index 9ea945b38..bca38bf75 100644
--- a/modules/addon/addon.class.php
+++ b/modules/addon/addon.class.php
@@ -30,8 +30,10 @@
             // 몇가지 애드온을 기본 활성화 상태로 변경
             $oAddonController->doActivate('member_extra_info');
             $oAddonController->doActivate('counter');
-            $oAddonController->doActivate('blogapi');
+            //$oAddonController->doActivate('blogapi');
             $oAddonController->doActivate('referer');
+            $oAddonController->doActivate('autolink');
+            $oAddonController->doActivate('resize_image');
             $oAddonController->procAddonAdminToggleActivate();
             return new Object();
         }
diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php
index 4af3b6641..5022e7237 100644
--- a/modules/board/board.admin.controller.php
+++ b/modules/board/board.admin.controller.php
@@ -170,6 +170,7 @@
             // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
             if(!$args) {
                 $args = Context::gets('module_srl','module_category_srl','board_name','layout_srl','skin','browser_title','description','is_default','header_text','footer_text','admin_id');
+                $extra_var = delObjectVars(Context::getRequestVars(), $args);
             }
 
             $args->module = 'board';
@@ -178,7 +179,6 @@
             if($args->is_default!='Y') $args->is_default = 'N';
 
             // 기본 값외의 것들을 정리
-            $extra_var = delObjectVars(Context::getRequestVars(), $args);
             if($extra_var->use_category!='Y') $extra_var->use_category = 'N';
             if($extra_var->except_notice!='Y') $extra_var->except_notice = 'N';
             if($extra_var->consultation!='Y') $extra_var->consultation = 'N';
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index d10e7e26f..e4c55e76b 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -125,6 +125,9 @@
                 // 글이 존재하면 글 보기 권한에 대한 확인과 조회수증가/ 브라우저 타이틀의 설정을 함
                 } else {
 
+                    // 글과 요청된 모듈이 다르다면 오류 표시
+                    if($oDocument->get('module_srl')!=Context::get('module_srl') ) return $this->stop('msg_invalid_request');
+
                     // 관리 권한이 있다면 권한을 부여
                     if($this->grant->manager) $oDocument->setGrant();
 

From 7561449424f489d6c9697c53496824ca3ff15320 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 16 May 2008 04:38:49 +0000
Subject: [PATCH 111/111] =?UTF-8?q?1.0.3=20=EB=B2=84=EC=A0=84=20=EC=98=AC?=
 =?UTF-8?q?=EB=A6=BC?=
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@4209 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 config/config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.inc.php b/config/config.inc.php
index 46d960ff1..a8e15edfe 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -14,7 +14,7 @@
      * 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며
      * config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
      **/
-    define('__ZBXE_VERSION__', '1.0.2');
+    define('__ZBXE_VERSION__', '1.0.3');
 
     /**
      * @brief 디버깅 메세지 출력