diff --git a/module/misc/control.php b/module/misc/control.php index 25c6a9a774..7087f21e4b 100644 --- a/module/misc/control.php +++ b/module/misc/control.php @@ -129,10 +129,15 @@ class misc extends control public function qrCode() { $loginAPI = common::getSysURL() . $this->config->webRoot; - $withSessionLoginAPI = $this->loadModel('user')->isLogon() ? $loginAPI . "?sid=" . session_ID() : $loginAPI; + $session = $this->loadModel('user')->isLogon() ? '?sid=' . session_id() : ''; - if(!extension_loaded('gd')) die(printf($this->lang->misc->noGDLib, $loginAPI)); - $ciqrcode = $this->app->loadClass('qrcode'); - QRcode::png($withSessionLoginAPI, false, 4, 9); + if(!extension_loaded('gd')) + { + $this->view->noGDLib = sprintf($this->lang->misc->noGDLib, $loginAPI); + die($this->display()); + } + + $this->app->loadClass('qrcode'); + QRcode::png($loginAPI . $session, false, 4, 9); } } diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 4e68be0b12..e9306e7832 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -46,5 +46,6 @@ $lang->misc->zentao->service['install'] = 'Install service'; $lang->misc->zentao->service['fixissue'] = 'Issue support'; $lang->misc->zentao->service['servicemore']= 'More...'; -$lang->misc->noGDLib = "PHP don't has GD extensions. The entrance of mobile browser: %s."; +$lang->misc->mobile = "Mobile access"; +$lang->misc->noGDLib = "Please visit:%s."; $lang->misc->copyright = "Copyright ©2009-2013 Nature EasySoft Network Tecnology Co.ltd, QingDao, China"; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 08a0fefef6..fe2043b1db 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -46,5 +46,6 @@ $lang->misc->zentao->service['install'] = '禅道安装服务'; $lang->misc->zentao->service['fixissue'] = '禅道问题解决'; $lang->misc->zentao->service['servicemore']= '更多服务...'; -$lang->misc->noGDLib = "您的PHP没有安装GD库扩展,请用手机浏览器直接访问:%s"; +$lang->misc->mobile = "手机访问"; +$lang->misc->noGDLib = "请用手机浏览器访问:%s"; $lang->misc->copyright = "版权所有 ©2009-2013 青岛易软天创网络科技有限公司"; diff --git a/module/user/control.php b/module/user/control.php index 64605e9f98..5ea8bebf76 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -702,6 +702,8 @@ class user extends control $this->view->demoUsers = $demoUsers; } + $this->app->loadLang('misc'); + $this->view->noGDLib = sprintf($this->lang->misc->noGDLib, common::getSysURL() . $this->config->webRoot); $this->view->title = $this->lang->user->login; $this->view->referer = $this->referer; $this->view->s = zget($this->config->global, 'sn'); diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 5cf2ea3d6d..eaa147dfb3 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -54,7 +54,7 @@ $lang->user->update = "Upgrade"; $lang->user->delete = "Delete"; $lang->user->browse = "Browse"; $lang->user->login = "Login"; -$lang->user->mobileLogin = "Mobile Login"; +$lang->user->mobileLogin = "Mobile"; $lang->user->userView = "User view"; $lang->user->editProfile = "Edit profile"; $lang->user->editPassword = "Change password"; diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 968fb97635..5dba1d3eb2 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -25,7 +25,13 @@ include '../../common/view/header.lite.html.php';

user->mobileLogin ?>

- + + ' /> + + + +
+