From 44d6401495aeb2784ed1bd9112fa04085b0edf9a Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Sat, 13 Jul 2013 08:59:49 +0000
Subject: [PATCH]  * finish task#1563.

---
 module/common/model.php    | 2 +-
 module/misc/control.php    | 7 ++++---
 module/misc/lang/en.php    | 1 +
 module/misc/lang/zh-cn.php | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 597bc0214d..db6e31b5d8 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -525,7 +525,7 @@ class commonModel extends model
     public static function printQRCodeLink($color = '')
     {
         global $lang;
-        if(extension_loaded('gd')) echo html::a(helper::createLink('misc', 'qrCode'), $lang->user->mobileLogin, '', "class='qrCode $color'");
+        echo html::a(helper::createLink('misc', 'qrCode'), $lang->user->mobileLogin, '', "class='qrCode $color'");
     }
 
     /**
diff --git a/module/misc/control.php b/module/misc/control.php
index 7d1d142705..506ae30a76 100644
--- a/module/misc/control.php
+++ b/module/misc/control.php
@@ -123,15 +123,16 @@ class misc extends control
     /**
      * Create qrcode for mobile login.
      * 
-     * @param  string $mode     template|qrcode
      * @access public
      * @return void
      */
-    public function qrCode($mode = 'template')
+    public function qrCode()
     {
-        $ciqrcode = $this->app->loadClass('qrcode');
         $loginAPI = common::getSysURL() . $this->config->webRoot;
         if($this->loadModel('user')->isLogon()) $loginAPI .= "?sid=" . session_ID();
+
+        if(!extension_loaded('gd')) die(printf($this->lang->misc->noGDLib, $loginAPI));
+        $ciqrcode = $this->app->loadClass('qrcode');
         QRcode::png($loginAPI, false, 4, 9);
     }
 }
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 546ca692a5..dcd6bcf821 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -46,4 +46,5 @@ $lang->misc->zentao->service['install']    = 'Install service';
 $lang->misc->zentao->service['fixissue']   = 'Issue support';
 $lang->misc->zentao->service['servicemore']= 'More...';
 
+$lang->misc->noGDLib   = "Can't find GD libary, the entrance of mobile browser： %s.";
 $lang->misc->copyright = "Copyright &copy;2009-2013 <a href='http://www.cnezsoft.com' target='_blank'>Nature EasySoft Network Tecnology Co.ltd, QingDao, China</a>";
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index d5ba0e26ea..346cbf74e5 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -46,4 +46,5 @@ $lang->misc->zentao->service['install']    = '禅道安装服务';
 $lang->misc->zentao->service['fixissue']   = '禅道问题解决';
 $lang->misc->zentao->service['servicemore']= '更多服务...';
 
+$lang->misc->noGDLib   = "找不到GD库，请用手机浏览器直接访问：%s";
 $lang->misc->copyright = "版权所有 &copy;2009-2013 <a href='http://www.cnezsoft.com' target='_blank'>青岛易软天创网络科技有限公司</a>";