系统结构调整

.gitignore

@@ -1,40 +1,40 @@
 .DS_Store
-src/data/tplcache/
-src/data/sessions*
-src/data/cache/
-src/data/common.inc.php
-src/data/config.cache.bak.php
-src/data/config.cache.inc.php
-src/install/install_lock.txt
-src/install/index.php.bak
-src/install/index.html
-src/install/module-install.php.bak
-src/a/*/
-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
-src/m/index.html
-src/uploads/userup
-src/uploads/20*
-src/data/mysqli_error_trace.inc
-src/uploads/litimg/*
-src/special/*.html
+public/data/tplcache/
+public/data/sessions*
+public/data/cache/
+public/data/common.inc.php
+public/data/config.cache.bak.php
+public/data/config.cache.inc.php
+public/install/install_lock.txt
+public/install/index.php.bak
+public/install/index.html
+public/install/module-install.php.bak
+public/a/*/
+public/uploads/allimg/*
+public/.txt
+public/data/enums/
+public/index.html
+public/data/admin/
+public/data/module/
+public/uploads/*.php
+public/data/time.lock.inc
+public/m/index.html
+public/uploads/userup
+public/uploads/20*
+public/data/mysqli_error_trace.inc
+public/uploads/litimg/*
+public/special/*.html
 *.bat
-src/data/backupdata/*
-src/a/*.html
-src/data/mkall_cache_*.php
-src/data/payment/cod.php
-src/freelist/
-src/data/rss/*
-src/data/rssmap.html
-src/data/sitemap.html
-src/data/js/
-src/data/vote/*.js
-src/data/module/*.xml
-src/data/*.db
-src/uploads/soft/*/
+public/data/backupdata/*
+public/a/*.html
+public/data/mkall_cache_*.php
+public/data/payment/cod.php
+public/freelist/
+public/data/rss/*
+public/data/rssmap.html
+public/data/sitemap.html
+public/data/js/
+public/data/vote/*.js
+public/data/module/*.xml
+public/data/*.db
+public/uploads/soft/*/

dedebiz

@@ -9,8 +9,8 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-//切换工作目录到./src
-$workDir = dirname(__FILE__) . "/src";
+//切换工作目录到./public
+$workDir = dirname(__FILE__) . "/public";
 chdir($workDir);
 
 if (substr(php_sapi_name(), 0, 3) === 'cgi') {
@@ -86,7 +86,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 		exit;
 	}
 
-	require_once($workDir . "/include/common.inc.php");
+	require_once($workDir . "/../system/common.inc.php");
 	require_once(DEDEINC . "/cli.class.php");
 
 	//一个命令行的生成工具
@@ -271,7 +271,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 		exit;
 	}
 } else if (count($argv) > 1 && ($argv[1] == "update" || $argv[1] == "u")) {
-	define("DEDEINC", $workDir."/include");
+	define("DEDEINC", $workDir."/../system");
 	require_once(DEDEINC."/dedehttpdown.class.php");
 	require_once(DEDEINC . "/cli.class.php");
 	//更新系统
@@ -294,7 +294,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	$offFiles = array();
 	//TODO 命令行自动更新
 } else if (count($argv) > 1 && ($argv[1] == "quick" || $argv[1] == "q")){
-	define("DEDEINC", $workDir."/include");
+	define("DEDEINC", $workDir."/../system");
 	require_once(DEDEINC . "/cli.class.php");
 	//快速开始一个用于开发的DedeBIZ环境，基于SQLite无其他依赖
 	if (file_exists($workDir."/data/DedeBIZ.db")) {

src/admin/article_test_same.php → public/admin/article_test_same.php

@@ -28,7 +28,7 @@ if ($dopost == 'analyse') {
 }
 //删除选中的内容（只保留一条）
 else if ($dopost == 'delsel') {
-    require_once(dirname(__FILE__)."/../include/typelink.class.php");
+    require_once(DEDEINC."/typelink.class.php");
     require_once(dirname(__FILE__)."/inc/inc_batchup.php");
 
     if (empty($titles)) {

src/admin/config.php → public/admin/config.php

@@ -9,7 +9,7 @@
  * @link           https://www.dedebiz.com
  */
 define('DEDEADMIN', str_replace("\\", '/', dirname(__FILE__)));
-require_once(DEDEADMIN . '/../include/common.inc.php');
+require_once(DEDEADMIN . '/../../system/common.inc.php');
 require_once(DEDEINC . '/userlogin.class.php');
 header('Cache-Control:private');
 $dsql->safeCheck = FALSE;

src/admin/dialog/config.php → public/admin/dialog/config.php

@@ -8,7 +8,7 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-require_once(dirname(__FILE__)."/../../include/common.inc.php");
+require_once(dirname(__FILE__)."/../../../system/common.inc.php");
 require_once(DEDEINC."/userlogin.class.php");
 //获得当前脚本名称，如果您的系统被禁用了$_SERVER变量，请自行修改这个选项
 $dedeNowurl   =  '';