diff --git a/.gitignore b/.gitignore index 0a2cabdd..13d08915 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ .DS_Store -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 +data/tplcache/ +data/sessions* +data/cache/ +data/common.inc.php +data/config.cache.bak.php +data/config.cache.inc.php public/install/install_lock.txt public/install/index.php.bak public/install/index.html @@ -12,29 +12,29 @@ public/install/module-install.php.bak public/a/*/ public/uploads/allimg/* public/.txt -public/data/enums/ +data/enums/ public/index.html -public/data/admin/ -public/data/module/ +data/admin/ +data/module/ public/uploads/*.php -public/data/time.lock.inc +data/time.lock.inc public/m/index.html public/uploads/userup public/uploads/20* -public/data/mysqli_error_trace.inc +data/mysqli_error_trace.inc public/uploads/litimg/* public/special/*.html *.bat -public/data/backupdata/* +data/backupdata/* public/a/*.html -public/data/mkall_cache_*.php -public/data/payment/cod.php +data/mkall_cache_*.php +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 +data/rss/* +data/rssmap.html +data/sitemap.html +data/js/ +data/vote/*.js +data/module/*.xml +data/*.db public/uploads/soft/*/ diff --git a/public/data/config.file.inc.php b/data/config.file.inc.php similarity index 100% rename from public/data/config.file.inc.php rename to data/config.file.inc.php diff --git a/public/data/downmix.data.php b/data/downmix.data.php similarity index 100% rename from public/data/downmix.data.php rename to data/downmix.data.php diff --git a/public/data/mail/index.html b/data/mail/index.html similarity index 100% rename from public/data/mail/index.html rename to data/mail/index.html diff --git a/public/data/mark/inc_photowatermark_config.php b/data/mark/inc_photowatermark_config.php similarity index 100% rename from public/data/mark/inc_photowatermark_config.php rename to data/mark/inc_photowatermark_config.php diff --git a/public/data/mark/index.html b/data/mark/index.html similarity index 100% rename from public/data/mark/index.html rename to data/mark/index.html diff --git a/public/data/mark/mark.gif b/data/mark/mark.gif similarity index 100% rename from public/data/mark/mark.gif rename to data/mark/mark.gif diff --git a/public/data/mark/mark.png b/data/mark/mark.png similarity index 100% rename from public/data/mark/mark.png rename to data/mark/mark.png diff --git a/public/data/payment/index.html b/data/payment/index.html similarity index 100% rename from public/data/payment/index.html rename to data/payment/index.html diff --git a/public/data/safe/inc_safe_config.php b/data/safe/inc_safe_config.php similarity index 100% rename from public/data/safe/inc_safe_config.php rename to data/safe/inc_safe_config.php diff --git a/public/data/safe/index.html b/data/safe/index.html similarity index 100% rename from public/data/safe/index.html rename to data/safe/index.html diff --git a/public/data/safequestions.php b/data/safequestions.php similarity index 100% rename from public/data/safequestions.php rename to data/safequestions.php diff --git a/public/data/smiley.data.php b/data/smiley.data.php similarity index 100% rename from public/data/smiley.data.php rename to data/smiley.data.php diff --git a/public/data/tag/index.html b/data/tag/index.html similarity index 100% rename from public/data/tag/index.html rename to data/tag/index.html diff --git a/public/data/tag/sql.inc.php b/data/tag/sql.inc.php similarity index 100% rename from public/data/tag/sql.inc.php rename to data/tag/sql.inc.php diff --git a/public/data/template.rand.php b/data/template.rand.php similarity index 100% rename from public/data/template.rand.php rename to data/template.rand.php diff --git a/public/data/textdata/index.html b/data/textdata/index.html similarity index 100% rename from public/data/textdata/index.html rename to data/textdata/index.html diff --git a/public/data/uploadtmp/index.html b/data/uploadtmp/index.html similarity index 100% rename from public/data/uploadtmp/index.html rename to data/uploadtmp/index.html diff --git a/public/data/vote/index.html b/data/vote/index.html similarity index 100% rename from public/data/vote/index.html rename to data/vote/index.html diff --git a/public/data/ziptmp/index.html b/data/ziptmp/index.html similarity index 100% rename from public/data/ziptmp/index.html rename to data/ziptmp/index.html diff --git a/public/admin/templets/content_list_d242855ac1da45e5f7dad37c.inc b/public/admin/templets/content_list_d242855ac1da45e5f7dad37c.inc new file mode 100644 index 00000000..7a87432e --- /dev/null +++ b/public/admin/templets/content_list_d242855ac1da45e5f7dad37c.inc @@ -0,0 +1,156 @@ + + + + +文档管理 + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+
+ + + + + +
+ + + + + + + + + +
+ + 关键字： + + + +
+
+
+
+ + + + + + + + + + + + + + + + + refObj->GetArcList($atts,$this->refObj,$fields); +if(is_array($blockValue)){ +foreach( $blockValue as $key=>$fields ) +{ +?> + + + + + + + + + + + + + + + + + + + +
文档列表（使用鼠标右键弹出菜单）
ID选择文章标题更新时间类目点击HTML权限发布人操作
+ + + + + + + + +
+ 全选 + 取消 + 更新 + 审核 + 推荐 + 移动 + 删除 + 自动关键字"; ?> + 增加属性 + 删除属性 +
refObj->GetPageList($atts,$this->refObj,$fields); +?> +
+
+ + \ No newline at end of file diff --git a/public/admin/templets/feedback_main_48366659e46c0953f54defb4.inc b/public/admin/templets/feedback_main_48366659e46c0953f54defb4.inc new file mode 100644 index 00000000..a43d489d --- /dev/null +++ b/public/admin/templets/feedback_main_48366659e46c0953f54defb4.inc @@ -0,0 +1,198 @@ + + + + + 评论管理 + + + + + + + + + + + + + + + + + + +
+
+ 评论管理 +
+
+
+ 关键字： + + + +
+
+
+ + refObj->GetArcList($atts,$this->refObj,$fields); +if(is_array($blockValue)){ +foreach( $blockValue as $key=>$fields ) +{ +?> + + + + + + + + + + +
+ + + + + + + + + + + + +
+  选择 + + 用户： + + 文档：'> (浏览) + 0) { ?>'>（条回复） + + + IP地址：'> + + 时间： + + '> 编辑 + &dopost=makehtml'>更新文档 +
+ + + + +
+ +
+
+
+ refObj->GetPageList($atts,$this->refObj,$fields); +?> + +
+ + + + + +
+ + + + + + + +
+
+
+ + + \ No newline at end of file diff --git a/public/index.php b/public/index.php index f38d55a8..5600e8d2 100755 --- a/public/index.php +++ b/public/index.php @@ -6,7 +6,7 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -if (!file_exists(dirname(__FILE__).'/data/common.inc.php')) { +if (!file_exists(dirname(__FILE__).'/../data/common.inc.php')) { header('Location:install/index.php'); exit(); } diff --git a/public/plus/advancedsearch.php b/public/plus/advancedsearch.php index b3bf80bf..ed093767 100755 --- a/public/plus/advancedsearch.php +++ b/public/plus/advancedsearch.php @@ -15,7 +15,7 @@ $timestamp = time(); @session_start(); //限制同时搜索数量 -$timelock = '../data/time.lock'; +$timelock = '../../data/time.lock'; if ($cfg_allsearch_limit < 1) { $cfg_allsearch_limit = 1; } diff --git a/system/common.inc.php b/system/common.inc.php index 5786a29d..df00f6bf 100755 --- a/system/common.inc.php +++ b/system/common.inc.php @@ -16,7 +16,8 @@ if (DEDE_ENVIRONMENT == 'production') { define('DEBUG_LEVEL', FALSE);//如果设置为TRUE则会打印执行SQL的时间和标签加载时间方便调试 define('DEDEINC', str_replace("\\", '/', dirname(__FILE__))); define('DEDEROOT', str_replace("\\", '/', substr(DEDEINC, 0, -6)).'public'); -define('DEDEDATA', DEDEROOT.'/data'); +define('BIZROOT', str_replace("\\", '/', substr(DEDEINC, 0, -6))); +define('DEDEDATA', substr(DEDEINC, 0, -6).'data'); define('DEDEMEMBER', DEDEROOT.'/member'); define('DEDETEMPLATE', DEDEROOT.'/templets'); define('DEDEBIZURL', "https://www.dedebiz.com");//Dede商业支持 diff --git a/system/dedetag.class.php b/system/dedetag.class.php index 545f0b6f..87e71de2 100755 --- a/system/dedetag.class.php +++ b/system/dedetag.class.php @@ -233,7 +233,7 @@ class DedeTagParse return FALSE; } $cdir = dirname($filename); - $cachedir = DEDEROOT.$cfg_tplcache_dir; + $cachedir = BIZROOT.$cfg_tplcache_dir; $ckfile = str_replace($cdir, '', $filename).substr(md5($filename), 0, 16).'.inc'; $ckfullfile = $cachedir.'/'.$ckfile; $ckfullfile_t = $cachedir.'/'.$ckfile.'.txt';