diff --git a/dedebiz b/dedebiz index 27029c45..55ada914 100755 --- a/dedebiz +++ b/dedebiz @@ -88,7 +88,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { } require_once($workDir . "/system/common.inc.php"); - require_once(DEDEINC . "/cli.class.php"); + require_once(DEDEINC . "/libraries/cli.class.php"); //一个命令行的生成工具 if (count($argv) > 2 && ($argv[2] == "arc" || $argv[2] == "a")) { @@ -274,7 +274,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { } else if (count($argv) > 1 && ($argv[1] == "update" || $argv[1] == "u")) { define("DEDEINC", $workDir."/system"); require_once(DEDEINC."/dedehttpdown.class.php"); - require_once(DEDEINC . "/cli.class.php"); + require_once(DEDEINC . "/libraries/cli.class.php"); //更新系统 $latestURL = "https://cdn.dedebiz.com/release/latest.txt"; $del = new DedeHttpDown(); @@ -296,7 +296,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { //TODO 命令行自动更新 } else if (count($argv) > 1 && ($argv[1] == "quick" || $argv[1] == "q")){ define("DEDEINC", $workDir."/system"); - require_once(DEDEINC . "/cli.class.php"); + require_once(DEDEINC . "/libraries/cli.class.php"); //快速开始一个用于开发的DedeBIZ环境，基于SQLite无其他依赖 if (file_exists($workDir."/data/DedeBIZ.db")) { DedeCli::write("development environment has inited"); diff --git a/src/admin/ad_edit.php b/src/admin/ad_edit.php index 0a5ab1ca..367e4b15 100644 --- a/src/admin/ad_edit.php +++ b/src/admin/ad_edit.php @@ -19,7 +19,7 @@ if ($dopost == 'delete') { ShowMsg("成功删除一则广告代码", $ENV_GOBACK_URL); exit(); } else if ($dopost == "gettag") { - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $jscode = ""; $showhtml = "\r\n\r\n$jscode\r\n\r\n"; $showhtml .= "预览："; diff --git a/src/admin/album_add.php b/src/admin/album_add.php index fbdfa225..27dba502 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -39,7 +39,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index ada951dc..2a8903fe 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -57,7 +57,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($typeid2)) $typeid2 = 0; diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index 72b522c6..7c93355c 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -42,7 +42,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index 08609c95..006a4180 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -253,7 +253,7 @@ function delArchives(){ } ---------------------------*/ else if ($dopost == "delArchives") { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($fmdo)) $fmdo = ''; if ($fmdo == 'yes') { @@ -387,7 +387,7 @@ function RbReturnArchives(){ } ------------------------------*/ else if ($dopost == 'return') { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); if (!empty($aid) && empty($qstr)) $qstr = $aid; @@ -409,7 +409,7 @@ function RbClearArchives(){ } ------------------------------*/ else if ($dopost == 'clear') { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($fmdo)) $fmdo = ''; $recycle = empty($recycle) ? "" : $recycle; @@ -464,7 +464,7 @@ function RbDelArchives(){ } ------------------------------*/ else if ($dopost == 'del') { CheckPurview('a_Del,a_AccDel,a_MyDel,sys_ArcBatch'); - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($fmdo)) $fmdo = ''; $recycle = empty($recycle) ? "" : $recycle; if ($fmdo == 'yes') { diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index bde543e7..6b231b9b 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -46,7 +46,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($litpic_b64)) $litpic_b64 = ''; diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php index faaf7e1b..e4cb83ac 100644 --- a/src/admin/archives_sg_add.php +++ b/src/admin/archives_sg_add.php @@ -40,7 +40,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); if ($typeid == 0) { ShowMsg("请指定文档的栏目", "-1"); exit(); diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php index 423599bd..7e6a1d61 100644 --- a/src/admin/archives_sg_edit.php +++ b/src/admin/archives_sg_edit.php @@ -38,7 +38,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); if ($typeid == 0) { ShowMsg("请指定文档的栏目", "-1"); exit(); diff --git a/src/admin/article_add.php b/src/admin/article_add.php index 7d3dbc1e..eba7ba9b 100644 --- a/src/admin/article_add.php +++ b/src/admin/article_add.php @@ -53,7 +53,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($typeid2)) $typeid2 = ''; diff --git a/src/admin/article_allowurl_edit.php b/src/admin/article_allowurl_edit.php index a4365a8a..6cbeffb1 100644 --- a/src/admin/article_allowurl_edit.php +++ b/src/admin/article_allowurl_edit.php @@ -9,7 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); -require_once(DEDEINC."/oxwindow.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); CheckPurview('sys_Source'); if (empty($dopost)) $dopost = ''; if (empty($allurls)) $allsource = ''; diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index 58dd4b90..1d4d5809 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -53,7 +53,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($typeid2)) $typeid2 = 0; diff --git a/src/admin/article_source_edit.php b/src/admin/article_source_edit.php index 13c8fe3a..940c3b61 100644 --- a/src/admin/article_source_edit.php +++ b/src/admin/article_source_edit.php @@ -9,7 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); -require_once(DEDEINC."/oxwindow.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); CheckPurview('sys_Source'); if (empty($dopost)) $dopost = ''; if (empty($allsource)) $allsource = ''; diff --git a/src/admin/article_string_mix.php b/src/admin/article_string_mix.php index 8a6ba4a1..66c7e72f 100644 --- a/src/admin/article_string_mix.php +++ b/src/admin/article_string_mix.php @@ -9,7 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__).'/config.php'); -require_once(DEDEINC.'/oxwindow.class.php'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); CheckPurview('sys_StringMix'); if (empty($dopost)) $dopost = ''; diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index c20f79ae..1cc3b7a5 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -9,7 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__).'/config.php'); -require_once(DEDEINC.'/oxwindow.class.php'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); CheckPurview('sys_StringMix'); if (empty($dopost)) $dopost = ''; $templates = empty($templates) ? '' : stripslashes($templates); diff --git a/src/admin/article_writer_edit.php b/src/admin/article_writer_edit.php index 1478277d..21afbdf6 100644 --- a/src/admin/article_writer_edit.php +++ b/src/admin/article_writer_edit.php @@ -9,7 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__).'/config.php'); -require_once(DEDEINC.'/oxwindow.class.php'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); CheckPurview('sys_Writer'); if (empty($dopost)) $dopost = ''; diff --git a/src/admin/catalog_del.php b/src/admin/catalog_del.php index 67d2d057..ef810017 100644 --- a/src/admin/catalog_del.php +++ b/src/admin/catalog_del.php @@ -13,7 +13,7 @@ require_once(dirname(__FILE__).'/config.php'); //检查权限许可 CheckPurview('t_Del,t_AccDel'); require_once(DEDEINC.'/typelink/typeunit.class.admin.php'); -require_once(DEDEINC.'/oxwindow.class.php'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); $id = trim(preg_replace("#[^0-9]#", '', $id)); //检查栏目操作许可 diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index c9518dc0..25d783b6 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -208,7 +208,7 @@ function unitCatalog() { } -----------------*/ else if ($dopost == 'unitCatalog') { CheckPurview('t_Move'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); require_once(DEDEINC.'/typelink/typelink.class.php'); require_once(DEDEINC.'/channelunit.func.php'); if (empty($nextjob)) { @@ -267,7 +267,7 @@ function moveCatalog() { } -----------------*/ else if ($dopost == 'moveCatalog') { CheckPurview('t_Move'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); require_once(DEDEINC.'/typelink/typelink.class.php'); require_once(DEDEINC.'/channelunit.func.php'); if (empty($nextjob)) { diff --git a/src/admin/diy_edit.php b/src/admin/diy_edit.php index 5cdd1b51..297c0af1 100644 --- a/src/admin/diy_edit.php +++ b/src/admin/diy_edit.php @@ -11,7 +11,7 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('c_Edit'); require_once(DEDEINC."/dedetag.class.php"); -require_once(DEDEINC."/oxwindow.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($dopost)) $dopost = ""; $diyid = (empty($diyid) ? 0 : intval($diyid)); /*---------------- diff --git a/src/admin/erraddsave.php b/src/admin/erraddsave.php index 5cc9c1fe..4eccbaf5 100644 --- a/src/admin/erraddsave.php +++ b/src/admin/erraddsave.php @@ -70,7 +70,7 @@ if ($dopost == "delete") { ShowMsg("成功删除指定的文档", "erraddsave.php"); exit(); } else { - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); $wintitle = "删除"; $wecome_info = "错误管理::删除错误"; $win = new OxWindow(); diff --git a/src/admin/file_manage_control.php b/src/admin/file_manage_control.php index 7d8facdb..f4cfa6ce 100644 --- a/src/admin/file_manage_control.php +++ b/src/admin/file_manage_control.php @@ -10,7 +10,7 @@ */ require(dirname(__FILE__)."/config.php"); CheckPurview('plus_文件管理器'); -require(DEDEINC."/oxwindow.class.php"); +require(DEDEINC."/libraries/oxwindow.class.php"); require_once(DEDEADMIN.'/file_class.php'); $activepath = str_replace("..", "", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath); diff --git a/src/admin/file_manage_view.php b/src/admin/file_manage_view.php index 183a219e..8dad7097 100644 --- a/src/admin/file_manage_view.php +++ b/src/admin/file_manage_view.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('plus_文件管理器'); -require_once(DEDEINC."/oxwindow.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); $activepath = str_replace("..", "", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath); if ($activepath == "/") $activepath = ""; diff --git a/src/admin/mail_file_manage.php b/src/admin/mail_file_manage.php index 030319ca..8df89d9d 100644 --- a/src/admin/mail_file_manage.php +++ b/src/admin/mail_file_manage.php @@ -1,6 +1,6 @@ GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); $wintitle = " 频道管理-查看模板"; $wecome_info = "频道管理::查看模板"; @@ -362,7 +362,7 @@ else if ($dopost == "delete") { if (empty($job)) $job = ""; if ($job == "") //确认提示 { - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); $wintitle = "频道管理-删除模型"; $wecome_info = "频道管理::删除模型"; $win = new OxWindow(); diff --git a/src/admin/mytag_edit.php b/src/admin/mytag_edit.php index 327e0014..21170b63 100644 --- a/src/admin/mytag_edit.php +++ b/src/admin/mytag_edit.php @@ -37,7 +37,7 @@ if ($dopost == 'delete') { ShowMsg("成功修改一个自定义标记", $ENV_GOBACK_URL); exit(); } else if ($dopost == "getjs") { - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); $jscode = ""; $showhtml = "\r\n\r\n$jscode\r\n\r\n"; $showhtml .= "预览："; diff --git a/src/admin/plus_edit.php b/src/admin/plus_edit.php index 3274d57c..406d7620 100644 --- a/src/admin/plus_edit.php +++ b/src/admin/plus_edit.php @@ -23,7 +23,7 @@ if ($dopost == "show") { if (empty($job)) $job = ""; if ($job == "") //确认提示 { - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); $wintitle = "删除插件"; $wecome_info = "插件管理::删除插件"; $win = new OxWindow(); diff --git a/src/admin/public_guide.php b/src/admin/public_guide.php index cca93cf5..a30dd80c 100644 --- a/src/admin/public_guide.php +++ b/src/admin/public_guide.php @@ -9,7 +9,7 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); -require_once(DEDEINC."/oxwindow.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($action)) $action = ''; /*-------------------- diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php index f976be84..b5850bb6 100644 --- a/src/admin/soft_add.php +++ b/src/admin/soft_add.php @@ -40,7 +40,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index 39591bbd..f2b92792 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -79,7 +79,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($typeid2)) $typeid2 = 0; diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php index 3b6e9514..8c9a46bd 100644 --- a/src/admin/spec_add.php +++ b/src/admin/spec_add.php @@ -30,7 +30,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index ca9202ef..fb4e96cc 100644 --- a/src/admin/spec_edit.php +++ b/src/admin/spec_edit.php @@ -44,7 +44,7 @@ function __save(){ } -------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; if (!isset($tags)) $tags = ''; diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index 26353043..b4077aa8 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -52,7 +52,7 @@ if ($dopost == 'saveedit') { if ($userok != "yes") { $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); $wintitle = "删除用户"; $wecome_info = "系统帐号管理::删除用户"; $win = new OxWindow(); diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index d6def5d3..60bc8478 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__).'/config.php'); CheckPurview('sys_ArcBatch'); -require_once(DEDEINC.'/oxwindow.class.php'); +require_once(DEDEINC.'/libraries/oxwindow.class.php'); //ShowMsg("目前暂不需要此工具，以后有需要系统会进行自动升级这个程序
<<点击此返回>>", "javascript:;"); //exit(); if (empty($dopost)) { diff --git a/src/admin/tpl.php b/src/admin/tpl.php index b4cb55e5..34fca1c0 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -118,7 +118,7 @@ function _upload() {} 上传新模板 -----------------------*/ else if ($action == 'upload') { - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $acdir = str_replace('.', '', $acdir); $win = new OxWindow(); make_hash(); @@ -225,7 +225,7 @@ else if ($action == 'savetagfile') { ShowMsg('文件名不合法，不允许进行操作', '-1'); exit(); } - require_once(DEDEINC.'/oxwindow.class.php'); + require_once(DEDEINC.'/libraries/oxwindow.class.php'); $tagname = preg_replace("#\.lib\.php$#i", "", $filename); $content = stripslashes($content); $truefile = DEDEINC.'/taglib/'.$filename; diff --git a/src/system/common.inc.php b/src/system/common.inc.php index f08d5f3d..52cf9ffb 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -223,7 +223,7 @@ if ($cfg_sendmail_bysmtp == 'Y' && !empty($cfg_smtp_usermail)) { $cfg_adminemail = $cfg_smtp_usermail; } //DedeBIZ商业化组件 -require_once(DEDEINC.'/dedebiz.class.php'); +require_once(DEDEINC.'/libraries/dedebiz.class.php'); //对全局分页传递参数进行过滤 if (isset($GLOBALS['PageNo'])) { $GLOBALS['PageNo'] = intval($GLOBALS['PageNo']); diff --git a/src/system/cli.class.php b/src/system/libraries/cli.class.php similarity index 100% rename from src/system/cli.class.php rename to src/system/libraries/cli.class.php diff --git a/src/system/dedebiz.class.php b/src/system/libraries/dedebiz.class.php similarity index 100% rename from src/system/dedebiz.class.php rename to src/system/libraries/dedebiz.class.php diff --git a/src/system/oxwindow.class.php b/src/system/libraries/oxwindow.class.php similarity index 100% rename from src/system/oxwindow.class.php rename to src/system/libraries/oxwindow.class.php diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index 0b5f59c9..ebc78011 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -52,7 +52,7 @@ function _SaveArticle(){ } ------------------------------*/ else if ($dopost == 'save') { include_once(DEDEINC."/image.func.php"); - include_once(DEDEINC."/oxwindow.class.php"); + include_once(DEDEINC."/libraries/oxwindow.class.php"); $svali = GetCkVdValue(); if (preg_match("/3/", $safe_gdopen)) { if (strtolower($vdcode) != $svali || $svali == '') { diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 59db840d..05b0c9e6 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -46,7 +46,7 @@ function _SaveArticle(){ } ------------------------------*/ else if ($dopost == 'save') { require_once(DEDEINC."/image.func.php"); - require_once(DEDEINC."/oxwindow.class.php"); + require_once(DEDEINC."/libraries/oxwindow.class.php"); $flag = ''; $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $userip = GetIP(); diff --git a/src/user/inc/archives_check.php b/src/user/inc/archives_check.php index 6b88d9ef..34f5aa4c 100755 --- a/src/user/inc/archives_check.php +++ b/src/user/inc/archives_check.php @@ -11,7 +11,7 @@ if (!defined('DEDEMEMBER')) exit('dedebiz'); include_once(DEDEINC.'/image.func.php'); -include_once(DEDEINC.'/oxwindow.class.php'); +include_once(DEDEINC.'/libraries/oxwindow.class.php'); $svali = GetCkVdValue(); if (strtolower($vdcode) != $svali || $svali == '') { diff --git a/src/user/inc/archives_check_edit.php b/src/user/inc/archives_check_edit.php index b605ccf5..26256833 100755 --- a/src/user/inc/archives_check_edit.php +++ b/src/user/inc/archives_check_edit.php @@ -11,7 +11,7 @@ if (!defined('DEDEMEMBER')) exit('dedebiz'); require_once(DEDEINC."/image.func.php"); -require_once(DEDEINC."/oxwindow.class.php"); +require_once(DEDEINC."/libraries/oxwindow.class.php"); $flag = ''; $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0;