From efa299b54fc3cc1fd7927a6821eb7b0ed9bfde56 Mon Sep 17 00:00:00 2001
From: misol <misol.kr@gmail.com>
Date: Sat, 23 May 2009 16:07:07 +0000
Subject: [PATCH] =?UTF-8?q?=EC=96=B8=EC=96=B4=EC=84=A0=ED=83=9D=20-=20?=
 =?UTF-8?q?=EB=8F=8C=EC=95=84=EA=B0=80=EA=B8=B0=20=EB=A7=81=ED=81=AC=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=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@6379 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/mobile/classes/mhtml.class.php  | 13 +++++++++----
 addons/mobile/classes/mobile.class.php |  6 +-----
 addons/mobile/classes/wml.class.php    | 12 +++++++++---
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/addons/mobile/classes/mhtml.class.php b/addons/mobile/classes/mhtml.class.php
index b90dbc1c3..fc5c1afa8 100644
--- a/addons/mobile/classes/mhtml.class.php
+++ b/addons/mobile/classes/mhtml.class.php
@@ -44,7 +44,7 @@
         }
 
         /**
-         * @brief 버튼을 출력함 
+         * @brief 버튼을 출력함
          **/
         function printBtn() {
             if($this->nextUrl) {
@@ -55,6 +55,14 @@
                 $url = $this->prevUrl;
                 printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
             }
+            // 언어선택
+            if(!parent::isLangChange()){
+                $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
+                printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
+            }
+            else {
+                printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
+            }
             if($this->upperUrl) {
                 $url = $this->upperUrl;
                 printf('<btn href="%s" name="%s">%s', $url->url, $url->text, "\n");
@@ -63,9 +71,6 @@
                 $url = $this->homeUrl;
                 printf('<a btn="%s" href="%s">%s</a><br>%s', $url->text, $url->url, $url->text, "\n");
             }
-            // 언어선택
-            $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-            printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
         }
 
         // 푸터 정보를 출력
diff --git a/addons/mobile/classes/mobile.class.php b/addons/mobile/classes/mobile.class.php
index 33816b151..cdbf7ee71 100644
--- a/addons/mobile/classes/mobile.class.php
+++ b/addons/mobile/classes/mobile.class.php
@@ -177,6 +177,7 @@
          * 모바일 브라우저가 아닐 경우 null return
          **/
         function getBrowserType() {
+            if(Context::get('smartphone')) return null;
             // 브라우저 타입을 판별
             $browserAccept = $_SERVER['HTTP_ACCEPT'];
             $userAgent = $_SERVER['HTTP_USER_AGENT'];
@@ -540,11 +541,6 @@
                 }
             }
 
-            $obj = null;
-            $obj['link'] = $obj['text'] = Context::getLang('lang_return');
-            $obj['href'] = Context::get('return_uri');
-            $childs[] = $obj;
-
             $this->setChilds($childs);
 
             $this->display();
diff --git a/addons/mobile/classes/wml.class.php b/addons/mobile/classes/wml.class.php
index 28913ba55..05f8bbbcb 100644
--- a/addons/mobile/classes/wml.class.php
+++ b/addons/mobile/classes/wml.class.php
@@ -49,7 +49,7 @@
         }
 
         /**
-         * @brief 버튼을 출력함 
+         * @brief 버튼을 출력함
          **/
         function printBtn() {
             if($this->nextUrl) {
@@ -60,6 +60,14 @@
                 $url = $this->prevUrl;
                 printf('<do type="vnd.prev" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
             }
+            // 언어선택
+            if(!parent::isLangChange()){
+                $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
+                printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
+            }
+            else {
+                printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
+            }
             if($this->homeUrl) {
                 $url = $this->homeUrl;
                 printf('<do type="access" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
@@ -68,8 +76,6 @@
                 $url = $this->upperUrl;
                 printf('<do type="vnd.up" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
             }
-            $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-            printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
         }
 
         // 푸터 정보를 출력