From a83cb3fc39589056f5a9e0e0c2b950df97ac9821 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 27 Apr 2023 09:16:36 +0800
Subject: [PATCH] * Modify download qrcode.

---
 module/common/model.php |  2 +-
 module/misc/control.php | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index f1a72e30ba..482d9e1a88 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1483,7 +1483,7 @@ class commonModel extends model
         global $config, $lang;
         if(isset($config->xxserver->installed) and $config->xuanxuan->turnon)
         {
-            $appQrcode = helper::createLink('misc', 'appQrcode');
+            $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>';
diff --git a/module/misc/control.php b/module/misc/control.php
index 27c6d0c707..9ffc3aef99 100644
--- a/module/misc/control.php
+++ b/module/misc/control.php
@@ -347,14 +347,16 @@ class misc extends control
      */
     public function appQrcode()
     {
-        if(!extension_loaded('gd'))
+        if(extension_loaded('gd'))
         {
-            $this->view->noGDLib = sprintf($this->lang->misc->noGDLib, $loginAPI);
-            return 'theme/default/images/main/mobile_qrcode.png';
+            $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'));
         }
-
-        $this->app->loadClass('qrcode');
-        $downloadUrl = 'https://www.zentao.net/page/zentaoapp.html?zentao=' . $this->config->version;
-        QRcode::png($downloadUrl, false, 2, 4, 2);
     }
 }