结构调整

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");

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 = "<script src='{$cfg_phpurl}/ad_js.php?aid=$aid' language='javascript'></script>";
     $showhtml = "<xmp style='color:#333333;background-color:#ffffff'>\r\n\r\n$jscode\r\n\r\n</xmp>";
     $showhtml .= "预览：<iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='200'></iframe>";

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);

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;

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);

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') {

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 = '';

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();

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();

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 = '';

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 = '';

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;

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 = '';

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 = '';
 

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);

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 = '';
 

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));
 
 //检查栏目操作许可

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)) {

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));
 /*----------------

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 = "<a href='erraddsave.php'>错误管理</a>::删除错误";
         $win = new OxWindow();

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);

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 = "";

src/admin/mail_file_manage.php

@@ -1,6 +1,6 @@
 <?php
 require(dirname(__FILE__)."/config.php");
-require_once(DEDEINC."/oxwindow.class.php");
+require_once(DEDEINC."/libraries/oxwindow.class.php");
 CheckPurview('plus_Mail');
 if(!isset($fmdo)) $fmdo="";
 if($fmdo=="del")

src/admin/mda_main.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");
 
 helper('mda');
 

src/admin/member_do.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($dopost)) $dopost = '';
 if (empty($fmdo)) $fmdo = '';
 $ENV_GOBACK_URL = isset($_COOKIE['ENV_GOBACK_URL']) ? 'member_main.php' : '';

src/admin/module_main.php

@@ -11,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_module');
 require_once(DEDEINC."/dedemodule.class.php");
-require_once(DEDEINC."/oxwindow.class.php");
+require_once(DEDEINC."/libraries/oxwindow.class.php");
 if (empty($action)) $action = '';
 require_once(DEDEDATA."/admin/config_update.php");
 $mdir = DEDEDATA.'/module';

src/admin/module_upload.php

@@ -11,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_module');
 require_once(DEDEINC."/dedemodule.class.php");
-require_once(DEDEINC."/oxwindow.class.php");
+require_once(DEDEINC."/libraries/oxwindow.class.php");
 if (empty($action)) $action = '';
 $mdir = DEDEDATA.'/module';
 if ($action == 'upload') {

src/admin/mychannel_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 = "";
 $id = isset($id) && is_numeric($id) ? $id : 0;
 /*----------------
@@ -327,7 +327,7 @@ else if ($dopost == "save") {
 function __GetTemplate()
 --------------------*/
 else if ($dopost == "gettemplets") {
-    require_once(DEDEINC."/oxwindow.class.php");
+    require_once(DEDEINC."/libraries/oxwindow.class.php");
     $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'");
     $wintitle = " 频道管理-查看模板";
     $wecome_info = "<a href='mychannel_main.php'>频道管理</a>::查看模板";
@@ -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 = "<a href='mychannel_main.php'>频道管理</a>::删除模型";
         $win = new OxWindow();

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 = "<script src='{$cfg_phpurl}/mytag_js.php?aid=$aid' language='javascript'></script>";
     $showhtml = "<xmp style='color:#333333;background-color:#ffffff'>\r\n\r\n$jscode\r\n\r\n</xmp>";
     $showhtml .= "<b>预览：</b><iframe name='testfrm' frameborder='0' src='mytag_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='250'></iframe>";

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 = "<a href='plus_main.php'>插件管理</a>::删除插件";
         $win = new OxWindow();

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 = '';
 
 /*--------------------

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);

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;

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);

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 = '';

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 = "<a href='sys_admin_user.php'>系统帐号管理</a>::删除用户";
         $win = new OxWindow();

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("目前暂不需要此工具，以后有需要系统会进行自动升级这个程序<br><a href='index_body.php'>&lt;&lt;点击此返回&gt;&gt;</a>", "javascript:;");
 //exit();
 if (empty($dopost)) {

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;

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']);

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 == '') {

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();

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 == '') {

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;