From 437b0092f587dca73843687f290c2525692ac271 Mon Sep 17 00:00:00 2001 From: mooo Date: Sun, 12 Apr 2009 12:43:28 +0000 Subject: [PATCH] =?UTF-8?q?#17870061=20:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=ED=94=8C=EB=9E=98=EB=8B=9B=20=EC=83=9D=EC=84=B1=EC=8B=9C=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EB=AA=A8=EB=93=88=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=93=B1=EA=B3=BC=20=EA=B2=B9=EC=B9=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20memberModel::isDeniedID()=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=9D=B4=EC=9A=A9=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EA=B2=80=EC=82=AC=ED=95=98=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@6092 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/planet/lang/en.lang.php | 11 ++++++----- modules/planet/lang/jp.lang.php | 3 ++- modules/planet/lang/ko.lang.php | 5 +++-- modules/planet/lang/zh-CN.lang.php | 1 + modules/planet/lang/zh-TW.lang.php | 3 ++- modules/planet/planet.controller.php | 10 ++++++++-- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/modules/planet/lang/en.lang.php b/modules/planet/lang/en.lang.php index e6fe2812b..229afede6 100644 --- a/modules/planet/lang/en.lang.php +++ b/modules/planet/lang/en.lang.php @@ -1,8 +1,8 @@ planet = "Planet"; @@ -18,7 +18,7 @@ $lang->planet_reply_content = "Planet reply content"; - $lang->about_planet = + $lang->about_planet = "XE microblog module. Each member can create the own planet. Planet may not be accessible with the domain name used in the homepage package. If you want to use planet as the index page, use different domain from domain name used in the homepage package."; @@ -30,7 +30,7 @@ $lang->about_planet_default_skin = "It will be set for main planet page and created planets."; $lang->planet_comment = "Introduction"; - $lang->about_planet_comment = "This message is displayed at the title of the browser and your planet."; + $lang->about_planet_comment = "This message is displayed at the title of the browser and your planet."; $lang->use_signup = "Display the link to sign up"; $lang->about_use_signup = "If set, the link to sign up will be displayed at the top of the planet"; @@ -44,6 +44,7 @@ $lang->msg_not_logged = "You are not signed in"; $lang->msg_planet_exists = "You already have a planet, thus you cannot create more!"; + $lang->msg_denied_planet_title = 'Denied planet title'; $lang->planet_userinfo = "User Info"; $lang->planet_change_userinfo = "Change user info"; @@ -113,7 +114,7 @@ $lang->planet_recent_acticle = "Recent Articles"; - $lang->cmd_planet_add_tag = "Add"; + $lang->cmd_planet_add_tag = "Add"; $lang->cmd_planet_add_article = "Write a message"; $lang->cmd_planet_post_article = "Submit"; $lang->planet_postscript = "P.S."; diff --git a/modules/planet/lang/jp.lang.php b/modules/planet/lang/jp.lang.php index 3b4cea84c..34f407a3f 100644 --- a/modules/planet/lang/jp.lang.php +++ b/modules/planet/lang/jp.lang.php @@ -18,7 +18,7 @@ $lang->planet_reply_content = "プラネットのコメント内容"; - $lang->about_planet = + $lang->about_planet = "microBlogのXEモジュールです。会員別のプラネットを作成して運営することが出来ます。 ホームページパッケージで登録されているドメインからプラネットへアクセス出来ない場合もあります。 プラネットを初期ページとして利用する場合は、ホームページパッケージで登録されているドメインと異なるドメインを登録して下さい。"; @@ -45,6 +45,7 @@ $lang->msg_not_logged = "ログインしていません。"; $lang->msg_planet_exists = "既に作成したプラネットがありますので、新しく作成することが出来ません。"; + $lang->msg_denied_planet_title = 'Denied planet title'; $lang->planet_userinfo = "個人情報"; $lang->planet_change_userinfo = "個人情報変更"; diff --git a/modules/planet/lang/ko.lang.php b/modules/planet/lang/ko.lang.php index 62bbb9418..4a7ff7d9f 100644 --- a/modules/planet/lang/ko.lang.php +++ b/modules/planet/lang/ko.lang.php @@ -18,7 +18,7 @@ $lang->planet_reply_content = '플래닛 댓글 내용'; - $lang->about_planet = + $lang->about_planet = "microBlog의 XE 모듈입니다. 회원별로 플래닛을 생성하여 운영할 수 있습니다 홈페이지 패키지에서 사용되는 도메인으로는 플래닛이 접속이 안될 수도 있습니다. 플래닛을 초기페이지로 사용하고 싶으시면 접속을 원하시는 도메인을 홈페이지 패키지등에서 사용하지 않으셔야 합니다"; @@ -45,6 +45,7 @@ $lang->msg_not_logged = '로그인 되어 있지 않습니다'; $lang->msg_planet_exists = '이미 생성하신 플래닛이 있어서 새로 만드실 수 없습니다'; + $lang->msg_denied_planet_title = '금지된 플래닛 제목입니다!'; $lang->planet_userinfo = '개인정보'; $lang->planet_change_userinfo = '개인정보변경'; @@ -177,6 +178,6 @@ $lang->msg_search_thisplanet = '이 플래닛에서 검색'; - + $lang->msg_welcome_planet = '플래닛 개설을 축하드립니다'; ?> diff --git a/modules/planet/lang/zh-CN.lang.php b/modules/planet/lang/zh-CN.lang.php index 634c3e25b..a06028525 100644 --- a/modules/planet/lang/zh-CN.lang.php +++ b/modules/planet/lang/zh-CN.lang.php @@ -45,6 +45,7 @@ $lang->msg_not_logged = "请登录。"; $lang->msg_planet_exists = "您已有生成的微博，不能另行创建微博。"; + $lang->msg_denied_planet_title = 'Denied planet title'; $lang->planet_userinfo = "个人资料"; $lang->planet_change_userinfo = "修改个人资料"; diff --git a/modules/planet/lang/zh-TW.lang.php b/modules/planet/lang/zh-TW.lang.php index 300dc75c9..fc2da913d 100644 --- a/modules/planet/lang/zh-TW.lang.php +++ b/modules/planet/lang/zh-TW.lang.php @@ -18,7 +18,7 @@ $lang->planet_reply_content = "微型部落格的回覆內容"; - $lang->about_planet = + $lang->about_planet = "XE微型部落格模組，可讓會員建立自己的微型部落格。 虛擬網站模組所使用的網域名稱無法用於微型部落格模組。 如果想將微型部落格當作首頁，請先在網站模組中設定其他的網域名稱。"; @@ -44,6 +44,7 @@ $lang->msg_not_logged = "請先登入。"; $lang->msg_planet_exists = "已建立微型部落格，無法再新增。"; + $lang->msg_denied_planet_title = 'Denied planet title'; $lang->planet_userinfo = "個人資料"; $lang->planet_change_userinfo = "修改個人資料"; diff --git a/modules/planet/planet.controller.php b/modules/planet/planet.controller.php index c17ece7ee..43346e16e 100644 --- a/modules/planet/planet.controller.php +++ b/modules/planet/planet.controller.php @@ -73,8 +73,14 @@ $args->mid = Context::get("planet_mid"); $args->tag = Context::get("tag"); - if(in_array($args->mid, array('www','naver','hangame','promotion','notice','group','team','center','division','tf','faq','question','uit'))) return new Object(-1,'msg_not_permitted'); + if(in_array($args->mid, array('www','naver','hangame','promotion','notice','group','team','center','division','tf','faq','question','uit'))) return new Object(-1,'msg_denied_planet_title'); + // 신청한 플래닛 이름이 기본 모듈 이름 등과 겹치지 않도록 금지 아이디 목록에 있는지 검사 + // 금지 아이디 목록 - 기본 모듈과 사용자 지정 금지 아이디 + $oMemberModel = &getModel('member'); + if($oMemberModel->isDeniedID($args->mid)) return new Object(-1,'msg_denied_planet_title'); + + // 플래닛 생성 $output = $this->insertPlanet($args); if(!$output->toBool()) return $output; @@ -739,7 +745,7 @@ $args->nick_name = $output->nick_name; $args->email_address = $output->email_address; $args->homepage = $output->homepage; - + $module_info = $oPlanetModel->getPlanetConfig(); $args->tags = join(',',$module_info->smstag);