From 89bf627ca20e147c0992752ffeb96e4d0a1d8bb5 Mon Sep 17 00:00:00 2001
From: llgoer <yanghuxiao@vip.qq.com>
Date: Sat, 5 Mar 2022 22:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3sqlite3=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4=E8=A1=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                               |  8 +++++---
 dedebiz                                  | 12 +++++++++---
 src/admin/dialog/select_mimages.php      |  8 ++++++++
 src/data/admin/allowurl.txt              |  2 ++
 src/data/admin/config_update.php         | 11 +++++++++++
 src/data/admin/idc.txt                   |  1 +
 src/data/admin/index.html                |  1 +
 src/data/admin/quickmenu-1.txt           |  5 +++++
 src/data/admin/quickmenu.txt             |  3 +++
 src/data/admin/source.txt                |  4 ++++
 src/data/admin/ver.txt                   |  1 +
 src/data/admin/verifies.txt              |  1 +
 src/data/admin/writer.txt                |  1 +
 src/data/cache/index.html                |  1 +
 src/data/tplcache/index.html             |  1 +
 src/system/database/dedesqlite.class.php |  5 ++---
 16 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 src/data/admin/allowurl.txt
 create mode 100644 src/data/admin/config_update.php
 create mode 100644 src/data/admin/idc.txt
 create mode 100644 src/data/admin/index.html
 create mode 100644 src/data/admin/quickmenu-1.txt
 create mode 100644 src/data/admin/quickmenu.txt
 create mode 100644 src/data/admin/source.txt
 create mode 100644 src/data/admin/ver.txt
 create mode 100644 src/data/admin/verifies.txt
 create mode 100644 src/data/admin/writer.txt
 create mode 100644 src/data/cache/index.html
 create mode 100644 src/data/tplcache/index.html

diff --git a/.gitignore b/.gitignore
index 5643d51c..3549add5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 .DS_Store
-src/data/tplcache/
+src/data/tplcache/*.inc
+src/data/tplcache/*.txt
 src/data/sessions*
-src/data/cache/
+src/data/cache/*.inc
+src/data/cache/*.dat
+src/data/cache/*/
 src/data/common.inc.php
 src/data/config.cache.bak.php
 src/data/config.cache.inc.php
@@ -14,7 +17,6 @@ src/uploads/allimg/*
 src/.txt
 src/data/enums/
 src/index.html
-src/data/admin/
 src/data/module/
 src/uploads/*.php
 src/data/time.lock.inc
diff --git a/dedebiz b/dedebiz
index 55ada914..bc7df73c 100755
--- a/dedebiz
+++ b/dedebiz
@@ -310,7 +310,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	$fp = fopen($workDir."/install/common.inc.php","r");
     $configStr1 = fread($fp,filesize($workDir."/install/common.inc.php"));
     fclose($fp);
-    @chmod($workDir."/../data",0777);
+    @chmod($workDir."/data",0777);
     $dbtype = "sqlite";
     $dbhost = "";
     $dbname = "DedeBIZ";
@@ -319,6 +319,8 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
     $dbprefix = "dede_";
     $dblang = "utf8";
 
+	mkdir($workDir.'/data/tplcache', 0777);
+
     //common.inc.php
     $configStr1 = str_replace("~dbtype~",$dbtype,$configStr1);
     $configStr1 = str_replace("~dbhost~",$dbhost,$configStr1);
@@ -348,11 +350,11 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
     $configStr2 = str_replace("~webname~",$webname,$configStr2);
     $configStr2 = str_replace("~adminmail~",$adminmail,$configStr2);
 
-    $fp = fopen($workDir.'/../data/config.cache.inc.php','w');
+    $fp = fopen($workDir.'/data/config.cache.inc.php','w');
     fwrite($fp,$configStr2);
     fclose($fp);
 
-    $fp = fopen($workDir.'/../data/config.cache.bak.php','w');
+    $fp = fopen($workDir.'/data/config.cache.bak.php','w');
     fwrite($fp,$configStr2);
     fclose($fp);
 
@@ -462,6 +464,10 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	if (phpversion() < "5.4") {
 		die("DedeBIZ:command web server not support\n\n");
 	}
+
+	// 写入安装程序锁
+	file_put_contents($workDir.'/install/install_lock.txt', 'ok');
+
 	echo "Start Dev Server For DedeBIZ\n\r";
 	echo "Open http://localhost:8088\n\r";
 	passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./'));
diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php
index 58a49351..b03b02ec 100644
--- a/src/admin/dialog/select_mimages.php
+++ b/src/admin/dialog/select_mimages.php
@@ -74,11 +74,19 @@ button+button{margin-left:10px}
             el.setAttribute('data-num',i);
         });
 	}
+    function isFileImage(file) {
+        return file && file['type'].split('/')[0] === 'image';
+    }
     function addList(files){
         var files_sum = files.length;
         var vDom = document.createDocumentFragment();
         for(let i=0;i<files_sum;i++){
             let file = files[i];
+            if (!isFileImage(file)) {
+                alert("选择非图片文件无法上传")
+                return;
+            }
+            console.log(file);
             let blobUrl = window.URL.createObjectURL(file)
             axupimgs.res.push({file:file,blobUrl:blobUrl,url:''});
             let li = document.createElement('li');
diff --git a/src/data/admin/allowurl.txt b/src/data/admin/allowurl.txt
new file mode 100644
index 00000000..5d7d43cb
--- /dev/null
+++ b/src/data/admin/allowurl.txt
@@ -0,0 +1,2 @@
+www.dedebiz.com
+www.zhelixie.com
\ No newline at end of file
diff --git a/src/data/admin/config_update.php b/src/data/admin/config_update.php
new file mode 100644
index 00000000..dc315641
--- /dev/null
+++ b/src/data/admin/config_update.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @version        $Id: config_update.php 1 11:36 2011-2-21 tianya $
+ * @package        DedeBIZ.Administrator
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
+ * @license        https://www.dedebiz.com/license
+ * @link           https://www.dedebiz.com
+ */
+
+//更新服务器，如果有变动，请到 https://www.dedebiz.com 查询
diff --git a/src/data/admin/idc.txt b/src/data/admin/idc.txt
new file mode 100644
index 00000000..76a0b06c
--- /dev/null
+++ b/src/data/admin/idc.txt
@@ -0,0 +1 @@
+暂无相关信息
\ No newline at end of file
diff --git a/src/data/admin/index.html b/src/data/admin/index.html
new file mode 100644
index 00000000..87245193
--- /dev/null
+++ b/src/data/admin/index.html
@@ -0,0 +1 @@
+dir
\ No newline at end of file
diff --git a/src/data/admin/quickmenu-1.txt b/src/data/admin/quickmenu-1.txt
new file mode 100644
index 00000000..aa9fcfca
--- /dev/null
+++ b/src/data/admin/quickmenu-1.txt
@@ -0,0 +1,5 @@
+<menu:item ico="images/addnews.gif" link="content_list.php" title="文档列表" />
+<menu:item ico="images/menuarrow.gif" link="feedback_main.php" title="评论管理" />
+<menu:item ico="images/manage1.gif" link="public_guide.php" title="内容发布" />
+<menu:item ico="images/file_dir.gif" link="catalog_main.php" title="栏目管理" />
+<menu:item ico="images/manage1.gif" link="sys_info.php" title="修改参数" />
\ No newline at end of file
diff --git a/src/data/admin/quickmenu.txt b/src/data/admin/quickmenu.txt
new file mode 100644
index 00000000..ae9bcb91
--- /dev/null
+++ b/src/data/admin/quickmenu.txt
@@ -0,0 +1,3 @@
+<menu:item ico="images/addnews.gif" link="content_list.php" title="文档列表" />
+<menu:item ico="images/menuarrow.gif" link="feedback_main.php" title="评论管理" />
+<menu:item ico="images/manage1.gif" link="public_guide.php" title="内容发布" />
\ No newline at end of file
diff --git a/src/data/admin/source.txt b/src/data/admin/source.txt
new file mode 100644
index 00000000..03836d53
--- /dev/null
+++ b/src/data/admin/source.txt
@@ -0,0 +1,4 @@
+DedeBIZ
+今日头条
+微信公众号
+百家号
\ No newline at end of file
diff --git a/src/data/admin/ver.txt b/src/data/admin/ver.txt
new file mode 100644
index 00000000..9068a635
--- /dev/null
+++ b/src/data/admin/ver.txt
@@ -0,0 +1 @@
+20220305
\ No newline at end of file
diff --git a/src/data/admin/verifies.txt b/src/data/admin/verifies.txt
new file mode 100644
index 00000000..e2983bed
--- /dev/null
+++ b/src/data/admin/verifies.txt
@@ -0,0 +1 @@
+20201022
\ No newline at end of file
diff --git a/src/data/admin/writer.txt b/src/data/admin/writer.txt
new file mode 100644
index 00000000..99dc1179
--- /dev/null
+++ b/src/data/admin/writer.txt
@@ -0,0 +1 @@
+秩名,网络,消息
\ No newline at end of file
diff --git a/src/data/cache/index.html b/src/data/cache/index.html
new file mode 100644
index 00000000..0d2ecd7f
--- /dev/null
+++ b/src/data/cache/index.html
@@ -0,0 +1 @@
+dir
diff --git a/src/data/tplcache/index.html b/src/data/tplcache/index.html
new file mode 100644
index 00000000..87245193
--- /dev/null
+++ b/src/data/tplcache/index.html
@@ -0,0 +1 @@
+dir
\ No newline at end of file
diff --git a/src/system/database/dedesqlite.class.php b/src/system/database/dedesqlite.class.php
index 80a1d48e..cde6874a 100755
--- a/src/system/database/dedesqlite.class.php
+++ b/src/system/database/dedesqlite.class.php
@@ -129,14 +129,13 @@ class DedeSqlite
     //为了防止采集等需要较长运行时间的程序超时，在运行这类程序时设置系统等待和交互时间
     function SetLongLink()
     {
-        @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID);
+        // @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID);
     }
 
     //获得错误描述
     function GetError()
     {
-        $str = mysqli_error($this->linkID);
-        return $str;
+        return $this->linkID->lastErrorMsg();
     }
 
     //关闭数据库