From a25c53003a7640a5c39bf2a4d0b00d2e47d85716 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Thu, 27 Apr 2023 22:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/mychannel_modifysearch.htm       | 2 +-
 src/apps/advancedsearch.php                         | 6 +++---
 src/apps/diy.php                                    | 6 +++---
 src/apps/download.php                               | 6 +++---
 src/apps/flink.php                                  | 4 ++--
 src/apps/heightsearch.php                           | 2 +-
 src/apps/list.php                                   | 2 +-
 src/apps/recommend.php                              | 2 +-
 src/apps/showphoto.php                              | 2 +-
 src/apps/view.php                                   | 6 +++---
 src/apps/vote.php                                   | 2 +-
 src/system/diyform.class.php                        | 6 +++---
 src/system/libraries/oxwindow.class.php             | 2 +-
 src/theme/{dedebiz => apps}/advancedsearch.htm      | 0
 src/theme/{plus => apps}/download_links_templet.htm | 0
 src/theme/{plus => apps}/flink-add.htm              | 0
 src/theme/{plus => apps}/flink-list.htm             | 0
 src/theme/{plus => apps}/heightsearch.htm           | 0
 src/theme/{plus => apps}/list_diyform.htm           | 0
 src/theme/{plus => apps}/post_diyform.htm           | 0
 src/theme/{plus => apps}/recommend.htm              | 0
 src/theme/{plus => apps}/showphoto.htm              | 0
 src/theme/{plus => apps}/view_diyform.htm           | 0
 src/theme/{plus => apps}/view_msg.htm               | 0
 src/theme/{plus => apps}/view_msg_catalog.htm       | 0
 src/theme/{plus => apps}/vote.htm                   | 0
 src/theme/{plus => apps}/win_templet.htm            | 0
 27 files changed, 24 insertions(+), 24 deletions(-)
 rename src/theme/{dedebiz => apps}/advancedsearch.htm (100%)
 rename src/theme/{plus => apps}/download_links_templet.htm (100%)
 rename src/theme/{plus => apps}/flink-add.htm (100%)
 rename src/theme/{plus => apps}/flink-list.htm (100%)
 rename src/theme/{plus => apps}/heightsearch.htm (100%)
 rename src/theme/{plus => apps}/list_diyform.htm (100%)
 rename src/theme/{plus => apps}/post_diyform.htm (100%)
 rename src/theme/{plus => apps}/recommend.htm (100%)
 rename src/theme/{plus => apps}/showphoto.htm (100%)
 rename src/theme/{plus => apps}/view_diyform.htm (100%)
 rename src/theme/{plus => apps}/view_msg.htm (100%)
 rename src/theme/{plus => apps}/view_msg_catalog.htm (100%)
 rename src/theme/{plus => apps}/vote.htm (100%)
 rename src/theme/{plus => apps}/win_templet.htm (100%)

diff --git a/src/admin/templets/mychannel_modifysearch.htm b/src/admin/templets/mychannel_modifysearch.htm
index 26b08aba..ae930349 100644
--- a/src/admin/templets/mychannel_modifysearch.htm
+++ b/src/admin/templets/mychannel_modifysearch.htm
@@ -43,7 +43,7 @@
 					<td>自定义搜索结果页模板：</td>
 					<td>
 						<input type="text" name="template" value="<?php echo $template;?>" class="admin-input-lg">
-						<span>（填写文件名，且文件必须在templets/default目录）</span>
+						<span>（填写文件名，且文件必须在theme/apps目录）</span>
 					</td>
 				</tr>
 				<tr>
diff --git a/src/apps/advancedsearch.php b/src/apps/advancedsearch.php
index 33bc87f5..26ba9efc 100755
--- a/src/apps/advancedsearch.php
+++ b/src/apps/advancedsearch.php
@@ -179,10 +179,10 @@ $dlist = new DataListCP();
 $dlist->pagesize = 30;
 $dlist->SetParameter("hash", $sqlhash);
 $dlist->SetParameter("mid", $mid);
-if (file_exists(DEDEROOT."/theme/templets/$template")) {
-    $templatefile = DEDEROOT."/theme/templets/$template";
+if (file_exists(DEDEROOT."/theme/dedebiz/$template")) {
+    $templatefile = DEDEROOT."/theme/dedebiz/$template";
 } else {
-    $templatefile = DEDEROOT."/theme/templets/advancedsearch.htm";
+    $templatefile = DEDEROOT."/theme/apps/advancedsearch.htm";
 }
 $dlist->SetTemplate($templatefile);
 $dlist->SetSource($query);
diff --git a/src/apps/diy.php b/src/apps/diy.php
index 080f0f06..a52ffa21 100755
--- a/src/apps/diy.php
+++ b/src/apps/diy.php
@@ -21,7 +21,7 @@ $diy = new diyform($diyid);
 if ($action == 'post') {
     if (empty($do)) {
         $postform = $diy->getForm(true);
-        include DEDEROOT."/theme/plus/{$diy->postTemplate}";
+        include DEDEROOT."/theme/apps/{$diy->postTemplate}";
         exit();
     } elseif ($do == 2) {
         $dede_fields = empty($dede_fields) ? '' : trim($dede_fields);
@@ -94,7 +94,7 @@ if ($action == 'post') {
     $datalist->pagesize = 10;
     $datalist->SetParameter('action', 'list');
     $datalist->SetParameter('diyid', $diyid);
-    $datalist->SetTemplate(DEDEINC."/../theme/plus/{$diy->listTemplate}");
+    $datalist->SetTemplate(DEDEINC."/../theme/apps/{$diy->listTemplate}");
     $datalist->SetSource($query);
     $fieldlist = $diy->getFieldList();
     $datalist->Display();
@@ -119,6 +119,6 @@ if ($action == 'post') {
         exit();
     }
     $fieldlist = $diy->getFieldList();
-    include DEDEROOT."/theme/plus/{$diy->viewTemplate}";
+    include DEDEROOT."/theme/apps/{$diy->viewTemplate}";
 }
 ?>
\ No newline at end of file
diff --git a/src/apps/download.php b/src/apps/download.php
index f388fe6b..19b3fe9e 100755
--- a/src/apps/download.php
+++ b/src/apps/download.php
@@ -37,7 +37,7 @@ if ($open == 0) {
     include_once(DEDEINC.'/taglib/channel/softlinks.lib.php');
     $ctag = '';
     $downlinks = ch_softlinks($row[$vname], $ctag, $cu, '', TRUE);
-    require_once(DEDETEMPLATE.'/plus/download_links_templet.htm');
+    require_once(DEDETEMPLATE.'/apps/download_links_templet.htm');
     exit();
 }
 //提供软件给会员下载旧模式
@@ -167,7 +167,7 @@ else if ($open == 2) {
             $memberTypes[0] = "游客";
             $msgtitle = "您没有权限下载软件：{$arctitle}";
             $moremsg = "这个软件需要<span class='text-primary'>".$memberTypes[$needRank]."</span>才能下载，您目前等级是<span class='text-primary'>".$memberTypes[$cfg_ml->M_Rank]."</span>";
-            include_once(DEDETEMPLATE.'/plus/view_msg.htm');
+            include_once(DEDETEMPLATE.'/apps/view_msg.htm');
             exit();
         }
         //以下为正常情况，自动扣点数
@@ -181,7 +181,7 @@ else if ($open == 2) {
                 if ($needMoney > $cfg_ml->M_Money || $cfg_ml->M_Money == '') {
                     $msgtitle = "您没有权限下载软件：{$arctitle}";
                     $moremsg = "该软件需要<span class='text-primary'>".$needMoney."</span>金币才能下载，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>";
-                    include_once(DEDETEMPLATE.'/plus/view_msg.htm');
+                    include_once(DEDETEMPLATE.'/apps/view_msg.htm');
                     exit(0);
                 }
                 //有足够金币，记录会员信息
diff --git a/src/apps/flink.php b/src/apps/flink.php
index 6865611c..6aff2fb3 100755
--- a/src/apps/flink.php
+++ b/src/apps/flink.php
@@ -30,9 +30,9 @@ if ($dopost == 'save') {
     exit;
 } elseif ($dopost == 'add') {
     //显示模板简单PHP文件
-    include_once(DEDETEMPLATE.'/plus/flink-add.htm');
+    include_once(DEDETEMPLATE.'/apps/flink-add.htm');
     exit;
 }
 //显示模板简单PHP文件
-include_once(DEDETEMPLATE.'/plus/flink-list.htm');
+include_once(DEDETEMPLATE.'/apps/flink-list.htm');
 ?>
\ No newline at end of file
diff --git a/src/apps/heightsearch.php b/src/apps/heightsearch.php
index 8ca0e352..4e52d5d3 100755
--- a/src/apps/heightsearch.php
+++ b/src/apps/heightsearch.php
@@ -10,5 +10,5 @@
  */
 require_once(dirname(__FILE__).'/../system/common.inc.php');
 require_once(DEDEINC.'/typelink/typelink.class.php');
-require_once(DEDETEMPLATE.'/plus/heightsearch.htm');
+require_once(DEDETEMPLATE.'/apps/heightsearch.htm');
 ?>
\ No newline at end of file
diff --git a/src/apps/list.php b/src/apps/list.php
index 633cc4b2..2fdd8201 100755
--- a/src/apps/list.php
+++ b/src/apps/list.php
@@ -48,7 +48,7 @@ if ($tinfos['issystem'] == -1) {
             $memberTypes[0] = "游客或没权限会员";
             $msgtitle = "您没有权限浏览栏目：{$lv->Fields['typename']} ";
             $moremsg = "该栏目需要<span class='text-primary'>".$memberTypes[$lv->Fields['corank']]."</span>才能浏览，您目前等级是<span class='text-primary'>".$memberTypes[$cfg_ml->M_Rank]."</span>";
-            include_once(DEDETEMPLATE.'/plus/view_msg_catalog.htm');
+            include_once(DEDETEMPLATE.'/apps/view_msg_catalog.htm');
             exit();
         }
     }
diff --git a/src/apps/recommend.php b/src/apps/recommend.php
index d8d52d33..c5242f5a 100755
--- a/src/apps/recommend.php
+++ b/src/apps/recommend.php
@@ -66,5 +66,5 @@ if ($arcRow['aid'] == '') {
 }
 extract($arcRow, EXTR_OVERWRITE);
 //显示模板简单PHP文件
-include(DEDETEMPLATE.'/plus/recommend.htm');
+include(DEDETEMPLATE.'/apps/recommend.htm');
 ?>
\ No newline at end of file
diff --git a/src/apps/showphoto.php b/src/apps/showphoto.php
index cc6948db..0f7f6ba2 100755
--- a/src/apps/showphoto.php
+++ b/src/apps/showphoto.php
@@ -74,6 +74,6 @@ if ($nextSrc != '') {
 } else {
     $pageGuide .= " | 没有了";
 }
-require_once(DEDETEMPLATE.'/plus/showphoto.htm');
+require_once(DEDETEMPLATE.'/apps/showphoto.htm');
 exit();
 ?>
\ No newline at end of file
diff --git a/src/apps/view.php b/src/apps/view.php
index 8022eefb..2982c997 100755
--- a/src/apps/view.php
+++ b/src/apps/view.php
@@ -44,7 +44,7 @@ if ($needMoney > 0 || $needRank > 1) {
         $memberTypes[0] = "游客或没权限会员";
         $msgtitle = "您没有权限浏览文档：{$arctitle} ";
         $moremsg = "该文档需要<span class='text-primary'>".$memberTypes[$needRank]."</span>才能浏览，您目前等级是<span class='text-primary'>".$memberTypes[$cfg_ml->M_Rank]."</span>";
-        include_once(DEDETEMPLATE.'/plus/view_msg.htm');
+        include_once(DEDETEMPLATE.'/apps/view_msg.htm');
         exit();
     }
     //需要金币的情况
@@ -56,7 +56,7 @@ if ($needMoney > 0 || $needRank > 1) {
             if ($cfg_ml->M_Money == '' || $needMoney > $cfg_ml->M_Money) {
                 $msgtitle = "您没有权限浏览文档：{$arctitle} ";
                 $moremsg = "该文档需要<span class='text-primary'>".$needMoney."</span>金币才能浏览，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>，<a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/user/buy.php' target='_blank'>前去充值</a>";
-                include_once(DEDETEMPLATE.'/plus/view_msg.htm');
+                include_once(DEDETEMPLATE.'/apps/view_msg.htm');
                 $arc->Close();
                 exit();
             } else {
@@ -77,7 +77,7 @@ if ($needMoney > 0 || $needRank > 1) {
                 }
                 $msgtitle = "扣金币购买阅读";
                 $moremsg = "该文档需要付费<span class='text-primary'>".$needMoney."</span>金币，您目前金币<span class='text-primary'>".$cfg_ml->M_Money."</span>，<a class='btn btn-success btn-sm' href='{$GLOBALS['cfg_cmsurl']}/apps/view.php?aid=".$aid."&dopost=buy' target='_blank'>确认付点阅读</a>";
-                include_once($cfg_basedir.$cfg_templets_dir."/plus/view_msg.htm");
+                include_once($cfg_basedir.$cfg_templets_dir."/apps/view_msg.htm");
                 $arc->Close();
                 exit();
             }
diff --git a/src/apps/vote.php b/src/apps/vote.php
index 32203aa1..88886f20 100755
--- a/src/apps/vote.php
+++ b/src/apps/vote.php
@@ -58,5 +58,5 @@ if ($dopost == 'view') {
     }
 }
 //显示模板简单PHP文件
-include(DEDETEMPLATE.'/plus/vote.htm');
+include(DEDETEMPLATE.'/apps/vote.htm');
 ?>
\ No newline at end of file
diff --git a/src/system/diyform.class.php b/src/system/diyform.class.php
index 84d6cbaa..adf799c9 100755
--- a/src/system/diyform.class.php
+++ b/src/system/diyform.class.php
@@ -47,9 +47,9 @@ class diyform
         $this->name = $diyinfo['name'];
         $this->table = $diyinfo['table'];
         $this->public = $diyinfo['public'];
-        $this->listTemplate = $diyinfo['listtemplate'] != '' && file_exists(DEDETEMPLATE.'/plus/'.$diyinfo['listtemplate']) ? $diyinfo['listtemplate'] : 'list_diyform.htm';
-        $this->viewTemplate = $diyinfo['viewtemplate'] != '' && file_exists(DEDETEMPLATE.'/plus/'.$diyinfo['viewtemplate']) ? $diyinfo['viewtemplate'] : 'view_diyform.htm';;
-        $this->postTemplate = $diyinfo['posttemplate'] != '' && file_exists(DEDETEMPLATE.'/plus/'.$diyinfo['posttemplate']) ? $diyinfo['posttemplate'] : 'post_diyform.htm';;
+        $this->listTemplate = $diyinfo['listtemplate'] != '' && file_exists(DEDETEMPLATE.'/apps/'.$diyinfo['listtemplate']) ? $diyinfo['listtemplate'] : 'list_diyform.htm';
+        $this->viewTemplate = $diyinfo['viewtemplate'] != '' && file_exists(DEDETEMPLATE.'/apps/'.$diyinfo['viewtemplate']) ? $diyinfo['viewtemplate'] : 'view_diyform.htm';;
+        $this->postTemplate = $diyinfo['posttemplate'] != '' && file_exists(DEDETEMPLATE.'/apps/'.$diyinfo['posttemplate']) ? $diyinfo['posttemplate'] : 'post_diyform.htm';;
     }
     /**
      *  获取表单
diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php
index 19225d6b..b6edb2aa 100755
--- a/src/system/libraries/oxwindow.class.php
+++ b/src/system/libraries/oxwindow.class.php
@@ -220,7 +220,7 @@ class OxWindow
         }
         $ctp = new DedeTagParse();
         if ($modfile == '') {
-            $ctp->LoadTemplate($cfg_basedir.$cfg_templets_dir.'/plus/win_templet.htm');
+            $ctp->LoadTemplate($cfg_basedir.$cfg_templets_dir.'/apps/win_templet.htm');
         } else {
             $ctp->LoadTemplate($modfile);
         }
diff --git a/src/theme/dedebiz/advancedsearch.htm b/src/theme/apps/advancedsearch.htm
similarity index 100%
rename from src/theme/dedebiz/advancedsearch.htm
rename to src/theme/apps/advancedsearch.htm
diff --git a/src/theme/plus/download_links_templet.htm b/src/theme/apps/download_links_templet.htm
similarity index 100%
rename from src/theme/plus/download_links_templet.htm
rename to src/theme/apps/download_links_templet.htm
diff --git a/src/theme/plus/flink-add.htm b/src/theme/apps/flink-add.htm
similarity index 100%
rename from src/theme/plus/flink-add.htm
rename to src/theme/apps/flink-add.htm
diff --git a/src/theme/plus/flink-list.htm b/src/theme/apps/flink-list.htm
similarity index 100%
rename from src/theme/plus/flink-list.htm
rename to src/theme/apps/flink-list.htm
diff --git a/src/theme/plus/heightsearch.htm b/src/theme/apps/heightsearch.htm
similarity index 100%
rename from src/theme/plus/heightsearch.htm
rename to src/theme/apps/heightsearch.htm
diff --git a/src/theme/plus/list_diyform.htm b/src/theme/apps/list_diyform.htm
similarity index 100%
rename from src/theme/plus/list_diyform.htm
rename to src/theme/apps/list_diyform.htm
diff --git a/src/theme/plus/post_diyform.htm b/src/theme/apps/post_diyform.htm
similarity index 100%
rename from src/theme/plus/post_diyform.htm
rename to src/theme/apps/post_diyform.htm
diff --git a/src/theme/plus/recommend.htm b/src/theme/apps/recommend.htm
similarity index 100%
rename from src/theme/plus/recommend.htm
rename to src/theme/apps/recommend.htm
diff --git a/src/theme/plus/showphoto.htm b/src/theme/apps/showphoto.htm
similarity index 100%
rename from src/theme/plus/showphoto.htm
rename to src/theme/apps/showphoto.htm
diff --git a/src/theme/plus/view_diyform.htm b/src/theme/apps/view_diyform.htm
similarity index 100%
rename from src/theme/plus/view_diyform.htm
rename to src/theme/apps/view_diyform.htm
diff --git a/src/theme/plus/view_msg.htm b/src/theme/apps/view_msg.htm
similarity index 100%
rename from src/theme/plus/view_msg.htm
rename to src/theme/apps/view_msg.htm
diff --git a/src/theme/plus/view_msg_catalog.htm b/src/theme/apps/view_msg_catalog.htm
similarity index 100%
rename from src/theme/plus/view_msg_catalog.htm
rename to src/theme/apps/view_msg_catalog.htm
diff --git a/src/theme/plus/vote.htm b/src/theme/apps/vote.htm
similarity index 100%
rename from src/theme/plus/vote.htm
rename to src/theme/apps/vote.htm
diff --git a/src/theme/plus/win_templet.htm b/src/theme/apps/win_templet.htm
similarity index 100%
rename from src/theme/plus/win_templet.htm
rename to src/theme/apps/win_templet.htm