From 04500370c19ddface1a55b35f0c9c40692a67eac Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Fri, 8 Apr 2022 00:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/catalog_add.php                | 2 +-
 src/admin/dialog/select_images.php       | 4 ++--
 src/admin/inc/inc_archives_functions.php | 1 -
 src/system/archives.func.php             | 6 ------
 src/system/helpers/archive.helper.php    | 6 +++---
 src/user/inc/inc_archives_functions.php  | 1 -
 6 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100755 src/system/archives.func.php

diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php
index ad913724..5e4a419a 100644
--- a/src/admin/catalog_add.php
+++ b/src/admin/catalog_add.php
@@ -51,7 +51,7 @@ else if ($dopost == 'savequick') {
     $templist = "{style}/list_{$nid}.htm";
     $temparticle = "{style}/article_{$nid}.htm";
     $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,namegk,enname,ennamegk,bigpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`)
-    VALUES('~reid~','~topid~','~rank~','~typename~','~namegk~','~enname~','~ennamegk~','~bigpic~','~litimg~','~typedir~','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')";
+    VALUES('~reid~','~topid~','~rank~','~typename~','','','','','','~typedir~','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')";
     if (empty($savetype)) {
         foreach ($_POST as $k => $v) {
             if (preg_match("#^posttype#", $k)) {
diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php
index e13f30c7..1a55b21d 100644
--- a/src/admin/dialog/select_images.php
+++ b/src/admin/dialog/select_images.php
@@ -19,8 +19,8 @@ if (empty($imgstick)) {
 $noeditor = isset($noeditor) ? $noeditor : '';
 $activepath = str_replace('.', '', $activepath);
 $activepath = preg_replace("#\/{1,}#", '/', $activepath);
-if (strlen($activepath) < strlen($cfg_medias_dir)) {
-    $activepath = $cfg_medias_dir;
+if (strlen($activepath) < strlen($cfg_image_dir)) {
+    $activepath = $cfg_image_dir;
 }
 $inpath = $cfg_basedir.$activepath;
 $activeurl = '..'.$activepath;
diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php
index 689a1f0d..ccff6967 100644
--- a/src/admin/inc/inc_archives_functions.php
+++ b/src/admin/inc/inc_archives_functions.php
@@ -10,7 +10,6 @@
  */
 require_once(DEDEINC.'/libraries/dedehttpdown.class.php');
 require_once(DEDEINC.'/image.func.php');
-require_once(DEDEINC.'/archives.func.php');
 require_once(DEDEINC.'/archive/partview.class.php');
 $backurl = !empty($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : '';
 $backurl = preg_match("#content_#", $backurl) ? "<a href='$backurl' class='btn btn-success btn-sm'>记忆的列表页</a> &nbsp;" : '';
diff --git a/src/system/archives.func.php b/src/system/archives.func.php
deleted file mode 100755
index a41e98dc..00000000
--- a/src/system/archives.func.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if (!defined('DEDEINC')) exit('dedebiz');
-//为了兼容旧版本文件,这里将函数直接封装到archive小助手中
-//所以这里仅做一个文件引入映射,今后的开发,如果遇到此类函数
-//在开发过程中直接使用helper('archive');即可
-helper('archive');
\ No newline at end of file
diff --git a/src/system/helpers/archive.helper.php b/src/system/helpers/archive.helper.php
index ac968730..fc2e7367 100755
--- a/src/system/helpers/archive.helper.php
+++ b/src/system/helpers/archive.helper.php
@@ -87,11 +87,11 @@ if (!function_exists('GetChannelTable')) {
     {
         global $dsql;
         if ($formtype == 'archive') {
-            $query = "SELECT ch.maintable, ch.addtable FROM #@__arctiny tin LEFT JOIN #@__channeltype ch ON ch.id=tin.channel WHERE tin.id='$id'";
+            $query = "SELECT ch.maintable, ch.addtable FROM `#@__arctiny` tin LEFT JOIN `#@__channeltype` ch ON ch.id=tin.channel WHERE tin.id='$id'";
         } else if ($formtype == 'typeid') {
-            $query = "SELECT ch.maintable, ch.addtable FROM #@__arctype act LEFT JOIN #@__channeltype ch ON ch.id=act.channeltype WHERE act.id='$id'";
+            $query = "SELECT ch.maintable, ch.addtable FROM `#@__arctype` act LEFT JOIN `#@__channeltype` ch ON ch.id=act.channeltype WHERE act.id='$id'";
         } else {
-            $query = "SELECT maintable, addtable FROM #@__channeltype WHERE id='$id'";
+            $query = "SELECT maintable, addtable FROM `#@__channeltype` WHERE id='$id'";
         }
         $row = $dsql->GetOne($query);
         return $row;
diff --git a/src/user/inc/inc_archives_functions.php b/src/user/inc/inc_archives_functions.php
index 187f74f0..3e2a88cf 100755
--- a/src/user/inc/inc_archives_functions.php
+++ b/src/user/inc/inc_archives_functions.php
@@ -10,7 +10,6 @@
  */
 if (!defined('DEDEMEMBER')) exit('dedebiz');
 require_once(DEDEINC.'/image.func.php');
-require_once(DEDEINC.'/archives.func.php');
 require_once(DEDEINC."/userlogin.class.php");
 //检查用户是否被禁言
 CheckNotAllow();