Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 184

module/common/model.php

@@ -1483,12 +1483,11 @@ class commonModel extends model
         global $config, $lang;
         if(isset($config->xxserver->installed) and $config->xuanxuan->turnon)
         {
-            $appQrcode = extension_loaded('gd') ? helper::createLink('misc', 'appQrcode') : "{$config->webRoot}theme/default/images/main/mobile_qrcode.png";
             echo "<li class='dropdown-submenu'>";
             echo "<a href='javascript:;'>" . "<i class='icon icon-download'></i> " . $lang->clientName . "</a><ul class='dropdown-menu pull-left'>";
             echo '<li>' . html::a(helper::createLink('misc', 'downloadClient', '', '', true), $lang->downloadClient, '', "title='$lang->downloadClient' class='iframe text-ellipsis' data-width='600'") . '</li>';
             echo "<li class='dropdown-submenu' id='downloadMobile'><a href='javascript:;'>" . $lang->downloadMobile . "</a><ul class='dropdown-menu pull-left''>";
-            echo "<li><div class='mobile-qrcode local-img'><img src='$appQrcode' /></li>";
+            echo "<li><div class='mobile-qrcode local-img'><img src='{$config->webRoot}static/images/app-qrcode.png' /></li>";
             echo "</ul></li>";
             echo '<li>' . html::a($lang->clientHelpLink, $lang->clientHelp, '', "title='$lang->clientHelp' target='_blank'") . '</li>';
             echo '</ul></li>';

module/misc/control.php

@@ -338,25 +338,4 @@ class misc extends control
         if(strpos(",$accounts,", $this->app->user->account) === false) $accounts .= ',' . $this->app->user->account;
         $this->loadModel('setting')->setItem('system.common.global.skip' . ucfirst($feature), $accounts);
     }
-
-    /**
-     * Create qrcode for app download.
-     *
-     * @access public
-     * @return void
-     */
-    public function appQrcode()
-    {
-        if(extension_loaded('gd'))
-        {
-            $this->app->loadClass('qrcode');
-            $downloadUrl = 'https://www.zentao.net/page/zentaoapp.html?zentao=' . $this->config->version;
-            QRcode::png($downloadUrl, false, 2, 4, 2);
-        }
-        else
-        {
-            $this->view->noGDLib = sprintf($this->lang->misc->noGDLib, '');
-            return print($this->display('misc', 'qrCode'));
-        }
-    }
 }