From 83cb46a67121dccf292dd76063eb5282f18494aa Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Wed, 30 Nov 2022 20:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/api.php         |  1 +
 src/apps/qrcode.php       | 42 ---------------------------------------
 src/system/common.inc.php |  2 +-
 src/user/api.php          |  1 +
 4 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100755 src/apps/qrcode.php

diff --git a/src/admin/api.php b/src/admin/api.php
index 5c39d8d8..f55dd73e 100644
--- a/src/admin/api.php
+++ b/src/admin/api.php
@@ -10,6 +10,7 @@
  */
 define('AJAXLOGIN', TRUE);
 define('DEDEADMIN', str_replace("\\", '/', dirname(__FILE__)));
+$cfg_NotPrintHead = 'Y';
 require_once(DEDEADMIN.'/../system/common.inc.php');
 require_once(DEDEINC.'/userlogin.class.php');
 AjaxHead();
diff --git a/src/apps/qrcode.php b/src/apps/qrcode.php
deleted file mode 100755
index ded9b1fc..00000000
--- a/src/apps/qrcode.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * 二维码生成
- *
- * @version        $id:qrcode.php$
- * @package        DedeBIZ.Site
- * @copyright      Copyright (c) 2022 DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-$cfg_NotPrintHead = 'Y';
-require_once(dirname(__FILE__).'/../system/common.inc.php');
-require_once(DEDEINC.'/libraries/qrcode.class.php');
-$action = isset($action) ? $action : '';
-$type = isset($type) ? RemoveXSS(HtmlReplace($type, 3)) : '';
-$id = (isset($id) && is_numeric($id)) ? $id : 0;
-if (!in_array($type, array('list', 'arc', 'index'))) $url = "https://www.dedebiz.com";
-if ($action == 'get_qrcode') {
-    if ($type == 'arc') {
-        $url = $cfg_basehost.$cfg_plus_dir.'/view.php?aid='.$id;
-    } elseif ($type == 'list') {
-        $url = $cfg_basehost.$cfg_plus_dir.'/list.php?tid='.$id;
-    }
-    if ($id == 0) $url = "https://www.dedebiz.com";
-    if ($type == 'index') $url = $cfg_basehost.$cfg_plus_dir.'/index.php';
-    header("Content-Type: image/png");
-    $params = array();
-    $params['data'] = $url;
-    $params['size'] = 6;
-    $qrcode = new DedeQrcode;
-    $qrcode->generate($params);
-} else {
-    header("charset={$cfg_soft_lang}");
-    $dtp = new DedeTemplate();
-    $tplfile = DEDETEMPLATE.'/plus/qrcode.htm';
-    $dtp->LoadTemplate($tplfile);
-    $dtp->SetVar('id', $id);
-    $dtp->SetVar('type', $type);
-    $dtp->Display();
-    exit();
-}
-?>
\ No newline at end of file
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index 4ccdc5f8..40a64962 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -226,7 +226,7 @@ if (isset($GLOBALS['TotalResult'])) {
 }
 if (!isset($cfg_NotPrintHead)) {
     if (PHP_SAPI != 'cli') {
-        header("charset={$cfg_soft_lang}");
+        header("Content-Type: text/html; charset={$cfg_soft_lang}");
     }
 }
 //自动加载类库处理
diff --git a/src/user/api.php b/src/user/api.php
index de679148..7c064abf 100755
--- a/src/user/api.php
+++ b/src/user/api.php
@@ -7,6 +7,7 @@
  * @link           https://www.dedebiz.com
  */
 define('AJAXLOGIN', TRUE);
+$cfg_NotPrintHead = 'Y';
 require_once(dirname(__FILE__)."/config.php");
 AjaxHead();
 $action = isset($action)? $action : '';