Browse Source

调整

tags/6.2.8
叙述、别离 11 months ago
parent
commit
c438e42053
3 changed files with 10 additions and 11 deletions
  1. +8
    -9
      src/admin/api.php
  2. +1
    -1
      src/system/archive/listview.class.php
  3. +1
    -1
      src/system/archive/sglistview.class.php

+ 8
- 9
src/admin/api.php View File

@@ -17,7 +17,7 @@ require_once(DEDEINC.'/userlogin.class.php');
AjaxHead(); AjaxHead();
helper('cache'); helper('cache');
$action = isset($action) && in_array($action, array('is_need_check_code', 'has_new_version', 'get_changed_files', 'update_backup', 'get_update_versions', 'update', 'upload_image')) ? $action : ''; $action = isset($action) && in_array($action, array('is_need_check_code', 'has_new_version', 'get_changed_files', 'update_backup', 'get_update_versions', 'update', 'upload_image')) ? $action : '';
$curDir = dirname(GetCurUrl()); //当前目录
$curDir = dirname(GetCurUrl());//当前目录
/** /**
* 登录鉴权 * 登录鉴权
* *
@@ -47,7 +47,7 @@ if ($action === 'is_need_check_code') {
)); ));
exit; exit;
} else if ($action === 'has_new_version') { } else if ($action === 'has_new_version') {
//判断版本更新差异sql
//判断版本sql之间差异
$unQueryVer = array(); $unQueryVer = array();
if (!TableHasField("#@__tagindex", "keywords")) { if (!TableHasField("#@__tagindex", "keywords")) {
$unQueryVer[] = "6.0.2"; $unQueryVer[] = "6.0.2";
@@ -98,7 +98,7 @@ if ($action === 'is_need_check_code') {
} }
require_once(DEDEINC.'/libraries/dedehttpdown.class.php'); require_once(DEDEINC.'/libraries/dedehttpdown.class.php');
checkLogin(); checkLogin();
//是否存在更新版本
//发现有新版本
$phpv = phpversion(); $phpv = phpversion();
$sp_os = PHP_OS; $sp_os = PHP_OS;
$mysql_ver = $dsql->GetVersion(); $mysql_ver = $dsql->GetVersion();
@@ -187,8 +187,8 @@ if ($action === 'is_need_check_code') {
mkdir($backupPath); mkdir($backupPath);
foreach ($data as $file) { foreach ($data as $file) {
$realFile = DEDEROOT.str_replace("\\", '/', $file->filename); $realFile = DEDEROOT.str_replace("\\", '/', $file->filename);
//备份文件
if (file_exists($realFile) && md5_file($realFile) !== $file->hash) { if (file_exists($realFile) && md5_file($realFile) !== $file->hash) {
//备份文件
$dstFile = $backupPath.'/'.str_replace("\\", '/', $file->filename); $dstFile = $backupPath.'/'.str_replace("\\", '/', $file->filename);
@mkdir(dirname($dstFile), 0777, true); @mkdir(dirname($dstFile), 0777, true);
copy($realFile, $dstFile); copy($realFile, $dstFile);
@@ -247,8 +247,8 @@ if ($action === 'is_need_check_code') {
mkdir($backupVerPath); mkdir($backupVerPath);
foreach ($fileList as $f) { foreach ($fileList as $f) {
$realFile = $backupVerPath.$f->filename; $realFile = $backupVerPath.$f->filename;
//忽略src之外的目录
if (!preg_match("/^\//", $f->filename)) { if (!preg_match("/^\//", $f->filename)) {
//忽略src之外的目录
continue; continue;
} }
if (file_exists($realFile)) { if (file_exists($realFile)) {
@@ -260,7 +260,6 @@ if ($action === 'is_need_check_code') {
$fData = $dhd->GetHtml(); $fData = $dhd->GetHtml();
$dhd->Close(); $dhd->Close();
$f->filename = preg_replace('/^\/admin/', $curDir, $f->filename); $f->filename = preg_replace('/^\/admin/', $curDir, $f->filename);
@mkdir(dirname($realFile), 0777, true); @mkdir(dirname($realFile), 0777, true);
file_put_contents($realFile, $fData); file_put_contents($realFile, $fData);
} }
@@ -288,7 +287,7 @@ if ($action === 'is_need_check_code') {
foreach ($row as $k => $ver) { foreach ($row as $k => $ver) {
if ($ver->ispatched !== true) { if ($ver->ispatched !== true) {
$backupVerPath = $backupPath.'/'.$ver->ver; $backupVerPath = $backupPath.'/'.$ver->ver;
//执行更新SQL文件
//执行更新sql文件
$sql = file_get_contents($backupVerPath.'/update.sql'); $sql = file_get_contents($backupVerPath.'/update.sql');
if (!empty($sql)) { if (!empty($sql)) {
$sql = preg_replace('#ENGINE=MyISAM#i', 'TYPE=MyISAM', $sql); $sql = preg_replace('#ENGINE=MyISAM#i', 'TYPE=MyISAM', $sql);
@@ -306,8 +305,8 @@ if ($action === 'is_need_check_code') {
//复制文件 //复制文件
$fileList = json_decode(file_get_contents($backupVerPath.'/files.txt')); $fileList = json_decode(file_get_contents($backupVerPath.'/files.txt'));
foreach ($fileList as $f) { foreach ($fileList as $f) {
//忽略src之外的目录
if (!preg_match("/^\//", $f->filename)) { if (!preg_match("/^\//", $f->filename)) {
//忽略src之外的目录
continue; continue;
} }
$f->filename = preg_replace('/^\/admin/', $curDir, $f->filename); $f->filename = preg_replace('/^\/admin/', $curDir, $f->filename);
@@ -340,7 +339,7 @@ if ($action === 'is_need_check_code') {
), ),
)); ));
exit; exit;
} else if($action === 'upload_image'){
} else if($action === 'upload_image') {
checkLogin(); checkLogin();
$imgfile_name = $_FILES["file"]['name']; $imgfile_name = $_FILES["file"]['name'];
$activepath = $cfg_image_dir; $activepath = $cfg_image_dir;


+ 1
- 1
src/system/archive/listview.class.php View File

@@ -289,7 +289,7 @@ class ListView
} }
//创建封面模板文件 //创建封面模板文件
if ($this->TypeLink->TypeInfos['isdefault'] == -1) { if ($this->TypeLink->TypeInfos['isdefault'] == -1) {
echo DedeAlert('这个是动态栏目', ALERT_WARNING);
echo DedeAlert('该栏目采用动态浏览', ALERT_WARNING);
return '../apps/list.php?tid='.$this->TypeLink->TypeInfos['id']; return '../apps/list.php?tid='.$this->TypeLink->TypeInfos['id'];
} }
//单独页面 //单独页面


+ 1
- 1
src/system/archive/sglistview.class.php View File

@@ -247,7 +247,7 @@ class SgListView
} }
//创建封面模板文件 //创建封面模板文件
if ($this->TypeLink->TypeInfos['isdefault'] == -1) { if ($this->TypeLink->TypeInfos['isdefault'] == -1) {
echo DedeAlert('这个是动态栏目', ALERT_WARNING);
echo DedeAlert('该栏目采用动态浏览', ALERT_WARNING);
return ''; return '';
} }
//单独页面 //单独页面


Loading…
Cancel
Save