From 312f31db50d9e51668dbef7d918e2929c738441b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Mon, 7 Mar 2022 16:22:25 +0800
Subject: [PATCH] * Finish task #50327.

---
 xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php     | 1 +
 xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php  | 1 +
 xuanxuan/extension/xuan/im/ext/view/debug.html.php         | 3 +--
 xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php
index 4bd6677579..5b3ec49d83 100644
--- a/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php
@@ -14,6 +14,7 @@ $lang->resource->im->notifyMSG          = 'notifyMSG';
 $lang->resource->im->sendNotification   = 'sendNotification';
 $lang->resource->im->sendChatMessage    = 'sendChatMessage';
 $lang->resource->im->downloadXxdPackage = 'downloadXXD';
+$lang->resource->im->debug              = 'debug';
 
 $lang->resource->client = new stdclass();
 $lang->resource->client->browse       = 'browse';
diff --git a/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php
index 4bd6677579..5b3ec49d83 100644
--- a/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php
@@ -14,6 +14,7 @@ $lang->resource->im->notifyMSG          = 'notifyMSG';
 $lang->resource->im->sendNotification   = 'sendNotification';
 $lang->resource->im->sendChatMessage    = 'sendChatMessage';
 $lang->resource->im->downloadXxdPackage = 'downloadXXD';
+$lang->resource->im->debug              = 'debug';
 
 $lang->resource->client = new stdclass();
 $lang->resource->client->browse       = 'browse';
diff --git a/xuanxuan/extension/xuan/im/ext/view/debug.html.php b/xuanxuan/extension/xuan/im/ext/view/debug.html.php
index 77167b104b..6e499f07b5 100644
--- a/xuanxuan/extension/xuan/im/ext/view/debug.html.php
+++ b/xuanxuan/extension/xuan/im/ext/view/debug.html.php
@@ -19,8 +19,8 @@
         return;
     }
 ?>
-<?php if($this->app->user->admin != 'super'):?>
 <?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
+<?php if($this->app->user->admin != 'super'):?>
 <div class='container' id='debugContainer'>
   <div class='notice text-center' style='font-size:24px;'>
     <?php $_SERVER['SCRIPT_NAME'] = '/index.php';?>
@@ -29,7 +29,6 @@
   </div>
 </div>
 <?php else:?>
-<?php include $app->getModuleRoot() . 'common/view/header.modal.html.php';?>
 <script>
 if(!window.v) window.v = {};
 window.v.showLog = <?php echo $config->xuanxuan->debug;?>;
diff --git a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php
index 7424893be7..2ddc26353a 100644
--- a/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php
+++ b/xuanxuan/extension/xuan/setting/ext/view/xuanxuan.html.php
@@ -139,7 +139,7 @@
               <?php echo html::a(helper::createLink('setting', 'downloadXXD', 'type=package'), $lang->im->downloadXXD, 'hiddenwin', "class='btn btn-primary download download-package $disabled'");?>
               <?php echo html::a(helper::createLink('setting', 'downloadXXD', 'type=config'), $lang->im->downloadConfig, 'hiddenwin', "class='btn btn-primary download $disabled'");?>
               <?php echo html::a(helper::createLink('setting', 'xuanxuan', 'type=edit'), $lang->im->changeSetting, '', "class='btn'");?>
-              <?php if($debug) echo html::a(helper::createLink('im', 'debug', 'source=setting'), $lang->im->viewDebug, '', "class='btn viewDebug' data-toggle='modal'");?>
+              <?php if($debug and common::hasPriv('im', 'debug')) echo html::a(helper::createLink('im', 'debug', 'source=setting'), $lang->im->viewDebug, '', "class='btn viewDebug iframe' data-height=220");?>
               <?php echo html::a('http://www.zentao.net/book/zentaopmshelp/302.html', $lang->im->help, '_blank', "class='btn'");?>
             <?php endif;?>
           </td>