From 3f7d659bcc8115ccdf8cc3145c2da02e7af03367 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Mon, 24 Dec 2018 10:45:02 +0800
Subject: [PATCH] * Move my/ext/view to block/ext/view.

---
 .../ext/view/dashboard.xuanxuan.html.hook.php}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename xuanxuan/module/{my/ext/view/index.xuanxuan.html.hook.php => block/ext/view/dashboard.xuanxuan.html.hook.php} (83%)
 mode change 100644 => 100755

diff --git a/xuanxuan/module/my/ext/view/index.xuanxuan.html.hook.php b/xuanxuan/module/block/ext/view/dashboard.xuanxuan.html.hook.php
old mode 100644
new mode 100755
similarity index 83%
rename from xuanxuan/module/my/ext/view/index.xuanxuan.html.hook.php
rename to xuanxuan/module/block/ext/view/dashboard.xuanxuan.html.hook.php
index 4436118c7e..7d46845e74
--- a/xuanxuan/module/my/ext/view/index.xuanxuan.html.hook.php
+++ b/xuanxuan/module/block/ext/view/dashboard.xuanxuan.html.hook.php
@@ -4,13 +4,13 @@ $this->app->loadLang('chat');
 $account = $this->app->user->account;
 $xxInstalled = $this->app->user->account . 'installed';
 ?>
-<?php if(isset($config->xxserver->installed) and $config->xuanxuan->turnon and !isset($config->xxclient->$xxInstalled) and $config->global->flow == 'full' and $moduleName == 'my' and $methodName == 'index'):?>
+<?php if(isset($config->xxserver->installed) and $config->xuanxuan->turnon and !isset($config->xxclient->$xxInstalled) and $config->global->flow == 'full' ):?>
 var myModalTrigger = new $.zui.ModalTrigger({custom: '<?php echo $lang->chat->xxClientConfirm;?>', title: '<?php echo $lang->chat->zentaoClient;?>'});
 var result = myModalTrigger.show();
 <?php $this->loadModel('setting')->setItem("system.common.xxclient.{$account}installed", 1);?>
 <?php endif;?>
 
-<?php if(!isset($config->xxserver->noticed) and $this->app->user->admin and $config->global->flow == 'full' and $moduleName == 'my' and $methodName == 'index'):?>
+<?php if(!isset($config->xxserver->noticed) and $this->app->user->admin and $config->global->flow == 'full' and $config->$module->block->initVersion >= '2'):?>
 var myModalTrigger = new $.zui.ModalTrigger({custom: '<?php echo $lang->chat->xxServerConfirm;?>', title: '<?php echo $lang->chat->zentaoClient;?>'});
 var result = myModalTrigger.show();
 <?php $this->loadModel('setting')->setItem("system.common.xxserver.noticed", 1);?>