结构调整

.gitignore

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

dedebiz

@@ -10,7 +10,8 @@
  * @link           https://www.dedebiz.com
  */
 //切换工作目录到./public
-$workDir = dirname(__FILE__) . "/public";
+$workDir = dirname(__FILE__) . "/src";
+
 chdir($workDir);
 
 if (substr(php_sapi_name(), 0, 3) === 'cgi') {
@@ -81,12 +82,12 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	echo "Open http://localhost:8088\n\r";
 	passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./'));
 } else if (count($argv) > 1 && ($argv[1] == "make" || $argv[1] == "m")) {
-	if (!file_exists($workDir . "/../system/common.inc.php")) {
+	if (!file_exists($workDir . "/system/common.inc.php")) {
 		DedeCli::error("Check your root path is right");
 		exit;
 	}
 
-	require_once($workDir . "/../system/common.inc.php");
+	require_once($workDir . "/system/common.inc.php");
 	require_once(DEDEINC . "/cli.class.php");
 
 	//一个命令行的生成工具
@@ -271,7 +272,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."/../system");
+	define("DEDEINC", $workDir."/system");
 	require_once(DEDEINC."/dedehttpdown.class.php");
 	require_once(DEDEINC . "/cli.class.php");
 	//更新系统
@@ -294,10 +295,10 @@ 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."/../system");
+	define("DEDEINC", $workDir."/system");
 	require_once(DEDEINC . "/cli.class.php");
 	//快速开始一个用于开发的DedeBIZ环境，基于SQLite无其他依赖
-	if (file_exists($workDir."/../data/DedeBIZ.db")) {
+	if (file_exists($workDir."/data/DedeBIZ.db")) {
 		DedeCli::write("development environment has inited");
 		echo "Start Dev Server For DedeBIZ\n\r";
 		echo "Open http://localhost:8088\n\r";
@@ -305,7 +306,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 		exit;
 	}
 	//初始化安装一个开发环境
-	$db = new SQLite3($workDir.'/../data/DedeBIZ.db');
+	$db = new SQLite3($workDir.'/data/DedeBIZ.db');
 	$fp = fopen($workDir."/install/common.inc.php","r");
     $configStr1 = fread($fp,filesize($workDir."/install/common.inc.php"));
     fclose($fp);
@@ -326,7 +327,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
     $configStr1 = str_replace("~dbpwd~",$dbpwd,$configStr1);
     $configStr1 = str_replace("~dbprefix~",$dbprefix,$configStr1);
     $configStr1 = str_replace("~dblang~",$dblang,$configStr1);
-    $fp = fopen($workDir."/../data/common.inc.php","w") or die("error,check ../data writeable");
+    $fp = fopen($workDir."/data/common.inc.php","w") or die("error,check /data writeable");
     fwrite($fp,$configStr1);
     fclose($fp);
 

public/plus/car.php

@@ -1,44 +0,0 @@
-<?php
-/**
- *
- * 显示购物车的商品
- *
- * @version        $Id: car.php$
- * @package        DedeBIZ.Site
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-require_once(dirname(__FILE__)."/../../system/common.inc.php");
-define('_PLUS_TPL_', DEDEROOT.'/templets/plus');
-require_once(DEDEINC.'/dedetemplate.class.php');
-require_once DEDEINC.'/shopcar.class.php';
-require_once DEDEINC.'/memberlogin.class.php';
-$cart = new MemberShops();
-
-if (isset($dopost) && $dopost == 'makeid') {
-    AjaxHead();
-    $cart->MakeOrders();
-    echo $cart->OrdersId;
-    exit;
-}
-$cfg_ml = new MemberLogin();
-//获得购物车内商品,返回数组
-$Items = $cart->getItems();
-if ($cart->cartCount() < 1) {
-    ShowMsg("购物车中不存在任何商品", "javascript:window.close();", false, 5000);
-    exit;
-}
-@sort($Items);
-
-$carts = array(
-    'orders_id' => $cart->OrdersId,
-    'cart_count' => $cart->cartCount(),
-    'price_count' => $cart->priceCount()
-);
-
-$dtp = new DedeTemplate();
-$dtp->Assign('carts', $carts);
-$dtp->LoadTemplate(_PLUS_TPL_.'/car.htm');
-$dtp->Display();
-exit;

public/plus/carbuyaction.php

@@ -1,310 +0,0 @@
-<?php
-/**
- *
- * 购物车过程
- *
- * @version        $Id: carbuyaction.php$
- * @package        DedeBIZ.Site
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-require_once(dirname(__FILE__)."/../../system/common.inc.php");
-define('_PLUS_TPL_', DEDEROOT.'/templets/plus');
-require_once DEDEINC.'/dedetemplate.class.php';
-require_once DEDEINC.'/shopcar.class.php';
-require_once DEDEINC.'/memberlogin.class.php';
-
-if ($cfg_mb_open == 'N') {
-    ShowMsg("系统关闭了会员功能，因此您无法访问此页面", "javascript:;");
-    exit();
-}
-$rs = array();
-
-$cfg_ml = new MemberLogin();
-
-if (!isset($dopost) || empty($dopost)) {
-    $payment = 'none';
-    $cart    = new MemberShops();
-
-    //获得购物车内商品,返回数组
-    $Items = $cart->getItems();
-    if (empty($Items)) {
-        ShowMsg("您的购物车中没有商品", "-1");
-        exit();
-    }
-
-    $OrdersId = preg_replace("#[^0-9a-z_\-]#i", "", $cart->OrdersId);        //本次记录的订单号
-    $CartCount     = $cart->cartCount();    //商品总数
-    $priceCount    = $cart->priceCount(); //该订单总价格
-
-    /*
-    function PostOrdersForm();                //填写订单信息
-    */
-
-    if (!isset($do) || empty($do)) {
-        $shops_deliveryarr = array();
-        $dsql->SetQuery("SELECT pid,dname,price,des FROM #@__shops_delivery ORDER BY orders ASC");
-        $dsql->Execute();
-        while ($row = $dsql->GetArray()) {
-            $shops_deliveryarr[] = $row;
-        }
-
-        //获取支付接口列表
-        $shops_paymentarr = array();
-        $dsql->SetQuery("SELECT * FROM #@__payment WHERE enabled='1' ORDER BY rank ASC");
-        $dsql->Execute();
-        $i = 0;
-        while ($row = $dsql->GetArray()) {
-            $row['disabled'] = ($row['id'] == 5) && ($cfg_ml->M_Money < $priceCount) ? ' disabled="disabled"' : '';
-            $shops_paymentarr[] = $row;
-            $i++;
-        }
-        unset($row);
-
-        $dtp = new DedeTemplate();
-
-        $carts = array(
-            'orders_id' => $cart->OrdersId,
-            'cart_count' => $cart->cartCount(),
-            'price_count' => $cart->priceCount()
-        );
-        $dtp->Assign('carts', $carts);
-        $dtp->LoadTemplate(_PLUS_TPL_.'/carbuyaction.htm');
-        $dtp->Display();
-        exit();
-    } else if ($do == 'clickout') {
-        $svali = GetCkVdValue();
-        if ((strtolower($vdcode) != $svali || $svali == "") && $payment == 'none') {
-            ShowMsg("验证码错误", "-1");
-            exit();
-        }
-        if (empty($address)) {
-            ShowMsg("请填写收货地址", "-1");
-            exit();
-        }
-        if (empty($postname)) {
-            ShowMsg("请填写收货人姓名", "-1");
-            exit();
-        }
-        $paytype    = isset($paytype) && is_numeric($paytype) ? $paytype : 0;
-        $pid        = isset($pid) && is_numeric($pid) ? $pid : 0;
-        if ($paytype < 1) {
-            ShowMsg("请选择支付方式", "-1");
-            exit();
-        }
-        if ($pid < 1) {
-            ShowMsg("请选择配送方式", "-1");
-            exit();
-        }
-        $address     = cn_substrR(trim(RemoveXSS($address)), 200);
-        $des             = cn_substrR(RemoveXSS($des), 100);
-        $postname = cn_substrR(trim(RemoveXSS($postname)), 15);
-        $tel            = preg_replace("#[^-0-9,\/\| ]#", "", $tel);
-        $zip            = preg_replace("#[^0-9]#", "", $zip);
-        $email        = cn_substrR(RemoveXSS($email), 255);
-        if (empty($tel)) {
-            ShowMsg("请填写正确的收货人联系电话", "-1");
-            exit();
-        }
-        if ($zip < 1 || $zip > 999999) {
-            ShowMsg("请填写正确的收货人邮政编码", "-1");
-            exit();
-        }
-
-        //确认用户登录信息
-        if ($cfg_ml->IsLogin()) {
-            $userid = $cfg_ml->M_ID;
-        } else {
-            $username = trim($username);
-            $password = trim($password);
-
-            if (empty($username) || $password) {
-                ShowMsg("请选登录", "-1", 0, 2000);
-                exit();
-            }
-
-            $rs = $cfg_ml->CheckUser($username, $password);
-            if ($rs == 0) {
-                ShowMsg("用户名不存在", "-1", 0, 2000);
-                exit();
-            } else if ($rs == -1) {
-                ShowMsg("密码错误", "-1", 0, 2000);
-                exit();
-            }
-            $userid = $cfg_ml->M_ID;
-        }
-
-        //取得配送手续费
-        $rs = $dsql->GetOne("SELECT `price` FROM #@__shops_delivery WHERE pid='$pid' LIMIT 0,1");
-        $dprice = $rs['price'] > 0 ? $rs['price'] : 0;
-        unset($rs);
-        //
-        //取得支付方式手续费
-        $row = $dsql->GetOne("SELECT `fee` FROM #@__payment WHERE id='$paytype' LIMIT 0,1");
-        $fprice = $row['fee'] > 0 ? $row['fee'] : 0;
-        unset($row);
-        //
-        $ip = GetIP();
-        $stime = time();
-        //最后总计费用
-        $lastpriceCount = sprintf("%01.2f", $priceCount + $dprice + $fprice);
-
-        $rows = $dsql->GetOne("SELECT `oid` FROM #@__shops_orders WHERE oid='$OrdersId' LIMIT 0,1");
-        if (empty($rows['oid'])) {
-            $sql = "INSERT INTO `#@__shops_orders` (`oid`,`userid`,`cartcount`,`price`,`state`,`ip`,`stime`,`pid`,`paytype`,`dprice`,`priceCount`)
-            VALUES ('$OrdersId','$userid','$CartCount','$priceCount','0','$ip','$stime','$pid','$paytype','$dprice','$lastpriceCount');";
-
-            //更新订单
-            if ($dsql->ExecuteNoneQuery($sql)) {
-                foreach ($Items as $key => $val) {
-                    $val['price'] = str_replace(",", "", $val['price']);
-                    $dsql->ExecuteNoneQuery("INSERT INTO `#@__shops_products` (`aid`,`oid`,`userid`,`title`,`price`,`buynum`)
-                    VALUES ('$val[id]','$OrdersId','$userid','$val[title]','$val[price]','$val[buynum]');");
-                }
-                $sql = "INSERT INTO `#@__shops_userinfo` (`userid`,`oid`,`consignee`,`address`,`zip`,`tel`,`email`,`des`)
-                 VALUES ('$userid','$OrdersId','$postname','$address','$zip','$tel','$email','$des');
-                ";
-                $dsql->ExecuteNoneQuery($sql);
-            } else {
-                ShowMsg("更新订单时出现错误".$dsql->GetError(), "-1");
-                exit();
-            }
-        } else {
-            $sql = "UPDATE `#@__shops_orders`
-            SET `cartcount`='$CartCount',`price`='$priceCount',`ip`='$ip',`stime`='$stime',pid='$pid',paytype='$paytype',dprice='$dprice',priceCount='$lastpriceCount'
-            WHERE oid='$OrdersId' AND userid='$userid' ;";
-            if ($dsql->ExecuteNoneQuery($sql)) {
-                $sql = "UPDATE `#@__shops_userinfo`
-                SET `consignee`='$postname',`address`='$address',`zip`='$zip',`tel`='$tel',`email`='$email',`des`='$des'
-                WHERE oid='$OrdersId';";
-                $dsql->ExecuteNoneQuery($sql);
-            } else {
-                echo $dsql->GetError();
-                exit;
-            }
-            unset($sql);
-        }
-        //最后结算价格 = 最后统计价格
-        $priceCount = sprintf("%01.2f", $lastpriceCount);
-        //更新用户商品统计    
-        $countOrders = $dsql->GetOne("SELECT SUM(cartcount) AS nums FROM #@__shops_orders WHERE userid='".$cfg_ml->M_ID."'");
-        $dsql->ExecuteNoneQuery("UPDATE #@__member_tj SET `shop`='".$countOrders['nums']."' WHERE mid='".$cfg_ml->M_ID."'");
-
-        $rs = $dsql->GetOne("SELECT * FROM `#@__payment` WHERE id='$paytype' ");
-
-        require_once DEDEINC.'/payment/'.$rs['code'].'.php';
-        $pay = new $rs['code'];
-        if ($rs['code'] == "cod" || $rs['code'] == "bank") {
-            $order = $OrdersId;
-        } else {
-            $order = array(
-                'out_trade_no' => $cart->OrdersId,
-                'price' => $priceCount
-            );
-            require_once DEDEDATA.'/payment/'.$rs['code'].'.php';
-        }
-        $button = $pay->GetCode($order, $payment);
-        $dtp = new DedeTemplate();
-        $carts = array(
-            'orders_id' => $cart->OrdersId,
-            'cart_count' => $cart->CartCount(),
-            'price_count' => $priceCount
-        );
-        $row = $dsql->GetOne("SELECT dname,price FROM #@__shops_delivery WHERE pid='{$pid}'");
-        $dtp->SetVar('pay_name', $row['dname']);
-        $dtp->SetVar('price', $row['price']);
-        $dtp->SetVar('pay_way', $rs['name']);
-        $dtp->SetVar('description', $rs['description']);
-        $dtp->SetVar('button', $button);
-        $dtp->Assign('carts', $carts);
-        $dtp->LoadTemplate(_PLUS_TPL_.'/shops_action_payment.htm');
-        $dtp->Display();
-        exit();
-    }
-} else if ($dopost == 'memclickout') {
-    $svali = GetCkVdValue();
-    $rs = array();
-    if (preg_match("/S-P[0-9]+RN[0-9]/", $oid)) {
-        $oid = trim($oid);
-    } else {
-        ShowMsg("您的订单号不存在", "/user/shops_orders.php", 0, 2000);
-        exit();
-    }
-
-    //确认用户登录信息
-    if ($cfg_ml->IsLogin()) {
-        $userid = $cfg_ml->M_ID;
-    } else {
-        $username = trim($username);
-        $password = trim($password);
-
-        if (empty($username) || $password) {
-            ShowMsg("请选登录", "-1", 0, 2000);
-            exit();
-        }
-
-        $rs = $cfg_ml->CheckUser($username, $password);
-        if ($rs == 0) {
-            ShowMsg("用户名不存在", "-1", 0, 2000);
-            exit();
-        } else if ($rs == -1) {
-            ShowMsg("密码错误", "-1", 0, 2000);
-            exit();
-        }
-        $userid = $cfg_ml->M_ID;
-    }
-
-    $row = $dsql->GetOne("SELECT * FROM `#@__shops_orders` WHERE oid='$oid' ");
-    if (is_array($row)) {
-        $OrdersId = $oid;
-        $CartCount = $row['cartcount'];
-        $priceCount = $row['priceCount'];
-        $pid = $row['pid'];
-        $rs = $dsql->GetOne("SELECT * FROM `#@__payment` WHERE id='{$row['paytype']}' ");
-    }
-    $rs['code'] = isset($rs['code']) ? preg_replace("#[^0-9a-z_\-]+#i", "", $rs['code']) : "";
-    if (empty($rs['code']) or !file_exists(DEDEINC.'/payment/'.$rs['code'].'.php')) {
-        exit("Error:payment is not exsits!");
-    }
-
-    require_once DEDEINC.'/payment/'.$rs['code'].'.php';
-    $pay = new $rs['code'];
-    $payment = "";
-    if ($rs['code'] == "cod" || $rs['code'] == "bank") $order = $OrdersId;
-    else {
-        $order = array(
-            'out_trade_no' => $OrdersId,
-            'price' => $priceCount
-        );
-        require_once DEDEDATA.'/payment/'.$rs['code'].'.php';
-    }
-    $button = $pay->GetCode($order, $payment);
-    $dtp = new DedeTemplate();
-    $carts = array(
-        'orders_id' => $OrdersId,
-        'cart_count' => $CartCount,
-        'price_count' => $priceCount
-    );
-    $row = $dsql->GetOne("SELECT dname,price FROM #@__shops_delivery WHERE pid='{$pid}'");
-    $dtp->SetVar('pay_name', $row['dname']);
-    $dtp->SetVar('price', $row['price']);
-    $dtp->SetVar('pay_way', $rs['name']);
-    $dtp->SetVar('description', $rs['description']);
-    $dtp->SetVar('button', $button);
-    $dtp->Assign('carts', $carts);
-    $dtp->LoadTemplate(_PLUS_TPL_.'/shops_action_payment.htm');
-    $dtp->Display();
-    exit();
-} else if ($dopost == 'return') {
-    $write_list = array('alipay', 'bank', 'cod', 'yeepay');
-    if (in_array($code, $write_list)) {
-        require_once DEDEINC.'/payment/'.$code.'.php';
-        $pay = new $code;
-        $msg = $pay->respond();
-        ShowMsg($msg, "javascript:;", 0, 3000);
-        exit();
-    } else {
-        exit('Error:File Type Can\'t Recognized!');
-    }
-}

public/plus/posttocar.php

@@ -1,91 +0,0 @@
-<?php
-/**
- *
- * 发送到购物车
- *
- * @version        $Id: posttocar.php$
- * @package        DedeBIZ.Site
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-require_once(dirname(__FILE__)."/../../system/common.inc.php");
-require_once DEDEINC.'/shopcar.class.php';
-$cart = new MemberShops();
-
-$do = isset($do) ? trim($do) : 'add';
-
-if ($do == 'add') {
-    /*
-    function addItem();                add a product to car
-    */
-    $buynum = isset($buynum) && is_numeric($buynum) ? $buynum : 1;
-    $id = empty($id) ? "" : intval($id);
-    $buynum = ($buynum < 1) ? 1 : $buynum;
-    $rs = $dsql->GetOne("SELECT id,channel,title FROM #@__archives WHERE id='$id'");
-    if (!is_array($rs)) {
-        ShowMsg("该商品已不存在", "-1");
-        exit();
-    }
-    $cts = GetChannelTable($rs['channel']);
-    $rows = $dsql->GetOne("SELECT aid as id,trueprice as price,units FROM `$cts[addtable]` WHERE aid='$id'");
-    if (!is_array($rows)) {
-        ShowMsg("该商品已不存在", "-1");
-        exit();
-    }
-    $rows['buynum'] = $buynum;
-    $rows['title']     = $rs['title'];
-    $cart->addItem($id, $rows);
-    ShowMsg("已添加加到购物车,<a href='car.php'>查看购物车</a>", "car.php");
-    exit();
-} elseif ($do == 'del') {
-    /*
-    function delItem();                del products from car
-    */
-    if (!isset($ids)) {
-        ShowMsg("请选择要删除的商品", "-1");
-        exit;
-    }
-    if (is_array($ids)) {
-        foreach ($ids as $id) {
-            $id = intval($id);
-            $cart->delItem($id);
-        }
-    } else {
-        $ids = intval($ids);
-        $cart->delItem($ids);
-    }
-    ShowMsg("已成功删除购物车中的商品,<a href='car.php'>查看购物车</a>", "car.php");
-    exit;
-} elseif ($do == 'clear') {
-    /*
-    function clearItem();        clear car products all!
-    */
-    $cart->clearItem();
-    ShowMsg("购物车中商品已全部清空", "car.php");
-    exit;
-} elseif ($do == 'update') {
-    /*
-    function updateItem();        update car products number!
-    */
-    if (isset($ids) && is_array($ids)) {
-        foreach ($ids as $id) {
-            $id = intval($id);
-            $rs = $dsql->GetOne("SELECT id,channel,title FROM #@__archives WHERE id='$id'");
-            if (!is_array($rs)) continue;
-            $cts = GetChannelTable($rs['channel']);
-            $rows = $dsql->GetOne("SELECT aid as id,trueprice as price,units FROM `$cts[addtable]` WHERE aid='$id'");
-            if (!is_array($rows)) continue;
-            $rows['buynum'] = intval(${'buynum'.$id});
-            if ($rows['buynum'] < 1) {
-                //如果设单位数量小于1个时更新,则移出购物车
-                $cart->delItem($id);
-                continue;
-            }
-            $rows['title']     = $rs['title'];
-            $cart->addItem($id, $rows);
-        }
-    }
-    ShowMsg("购物车中商品已全部更新", "car.php");
-    exit;
-}

public/user/inc/config_pay_alipay.php

@@ -1,45 +0,0 @@
-<?php
-if (!defined('DEDEMEMBER')) exit('dedebiz');
-/**
- * 支付页面
- * 
- * @version        $Id: config_pay_alipay.php 1 13:52 2010年7月9日Z tianya $
- * @package        DedeBIZ.User
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-require_once(DEDEMEMBER."/paycenter/alipay/alipay_config.php");
-require_once(DEDEMEMBER."/paycenter/alipay/alipay_service.php");
-if ($payment_exp[2] < 0) $payment_exp[2] = 0;
-$piice_ex = $price * $payment_exp[2];
-$parameter = array(
-    "service" => "trade_create_by_buyer", //交易类型，必填实物交易＝trade_create_by_buyer（需要填写物流）
-    "partner" => $partner,                                                //合作商户号
-    "return_url" => $return_url,  //同步返回
-    "notify_url" => $notify_url,  //异步返回
-    "_input_charset" => $_input_charset,          //字符集，默认为GBK
-    "subject" => $ptype,                          //商品名称，必填
-    "body" => $pname,                             //商品描述，必填
-    "out_trade_no" => $buyid,                     //商品外部交易号，必填,每次测试都须修改
-    "logistics_fee" => '0.00',                    //物流配送费用
-    "logistics_payment" => 'BUYER_PAY',             //物流配送费用付款方式：SELLER_PAY(卖家支付)、BUYER_PAY(买家支付)、BUYER_PAY_AFTER_RECEIVE(货到付款)
-    "logistics_type" => 'EXPRESS',                  //物流配送方式：POST(平邮)、EMS(EMS)、EXPRESS(其他快递)
-    "price" => sprintf("%01.2f", $price),         //商品单价，必填
-    "payment_type" => "1",                          //默认为1,不需要修改
-    "quantity" => "1",                            //商品数量，必填
-    "show_url" => $show_url,                                //商品相关网站
-    "seller_email" => $seller_email               //卖家邮箱，必填
-);
-$alipay = new alipay_service($parameter, $security_code, $sign_type);
-$link    = $alipay->create_url();
-echo '<html>
-<head>
-    <title>转到支付宝支付页面</title>
-</head>
-<body onload="document.alipay.submit();">
-    <form name="alipay" action="'.$link.'" method="post">
-    </form>
-</body>
-</html>';
-exit;

public/user/inc/config_pay_cbpayment.php

@@ -1,36 +0,0 @@
-<?php
-if (!defined('DEDEMEMBER')) exit('dedebiz');
-require_once(DEDEMEMBER."/paycenter/cbpayment/cbpayment_config.php");
-if($payment_exp[3] < 0) $payment_exp[3] = 0;
-$piice_ex = $price*$payment_exp[3];
-$v_oid = trim($buyid); //订单号
-if($piice_ex > 0) $price = $price+$piice_ex;
-$v_amount = sprintf("%01.2f", $price);                   //支付金额                 
-$text = $v_amount.$v_moneytype.$v_oid.$v_mid.$v_url.$key;        //md5加密拼凑串,注意顺序不能变
-$v_md5info = strtoupper(md5($text));                             //md5函数加密并转化成大写字母
-$remark1 = trim($ptype);//备注字段1
-$remark2 = trim($pname);//备注字段2
-$v_rcvname   = '站长';		//收货人
-$v_rcvaddr   = '深圳';		//收货地址
-$v_rcvtel    = '0755-83791960';		//收货人电话
-$v_rcvpost   = '100080';		//收货人邮编
-$v_rcvmobile = '13838384381';		//收货人手机号
-$v_ordername   = $cfg_ml->M_UserName;	//订货人姓名
-$v_orderaddr   = '深圳';	//订货人地址
-$v_ordertel    = '0755-83791960';	//订货人电话
-$v_orderpost   = 518000;	//订货人邮编
-$v_orderemail  = 'service@nps.cn';	//订货人邮件
-$v_ordermobile = 13838384581;	//订货人手机号
-$strRequestUrl = $v_post_url.'?v_mid='.$v_mid.'&v_oid='.$v_oid.'&v_amount='.$v_amount.'&v_moneytype='.$v_moneytype
-	.'&v_url='.$v_url.'&v_md5info='.$v_md5info.'&remark1='.$remark1.'&remark2='.$remark2;
-
-echo '<html>
-<head>
-	<title>转到网银在线支付页面</title>
-</head>
-<body onload="document.cbpayment.submit();">
-	<form name="cbpayment" action="'.$strRequestUrl.'" method="post">
-	</form>
-</body>
-</html>';
-exit;

public/user/inc/config_pay_nps.php

@@ -1,61 +0,0 @@
-<?php
-if (!defined('DEDEMEMBER')) exit('dedebiz');
-//nps 网上支付接口
-include_once DEDEMEMBER.'/paycenter/nps/nps_config.inc.php';
-//支付手续费
-if($payment_exp[1] < 0.01) $payment_exp[1] = 0;
-$piice_ex = $price*$payment_exp[1];
-$price = $price+$piice_ex;
-//公共函数定义
-function HexToStr($hex)
-{
-    $string="";
-    for($i=0;$i<strlen($hex)-1;$i+=2){ $string.=chr(hexdec($hex[$i].$hex[$i+1])); }
-    return $string;
-}
-function StrToHex($string)
-{
-   $hex="";
-   for($i=0;$i<strlen($string);$i++){ $hex.=dechex(ord($string[$i])); }
-   $hex=strtoupper($hex);
-   return $hex;
-}
-//nps信息
-$m_language	=	1;
-$s_name		=	"陈康";
-$s_addr		=	"深圳";
-$s_postcode	=	518000;
-$s_tel		=	"0755-83791960";
-$r_name		=	"陈大康";
-$r_addr		=	"深圳";
-$r_postcode	=	100080;
-$r_tel		=	"010-81234567";
-$r_eml		=	"service@nps.cn";
-$m_status	= 	0;
-$m_ocurrency    =	1;
-$m_id		=	$cfg_merchant;
-$m_orderid	=	$buyid;
-$m_oamount	=	$price;
-$m_url		=	$cfg_basehost."/paycenter/nps/pay_back_nps.php";
-$m_ocomment	=	$cfg_ml->M_ID;
-$modate		=	GetDateTimeMk($mtime);
-//组织订单信息
-$m_info = $m_id."|".$m_orderid."|".$m_oamount."|".$m_ocurrency."|".$m_url."|".$m_language;
-$s_info = $s_name."|".$s_addr."|".$s_postcode."|".$s_tel."|".$s_eml;
-$r_info = $r_name."|".$r_addr."|".$r_postcode."|".$r_tel."|".$r_eml."|".$m_ocomment."|".$m_status."|".$modate;
-$OrderInfo = $m_info."|".$s_info."|".$r_info;
-//订单信息先转换成HEX，然后再加密
-$OrderInfo = StrToHex($OrderInfo);
-$digest = strtoupper(md5($OrderInfo.$cfg_merpassword));
-$strRequestUrl = $payment_url.'?OrderMessage='.$OrderInfo.'&digest='.$digest.'&M_ID='.$cfg_merchant;
-echo '<html>
-<head>
-	<title>转到NPS支付页面</title>
-</head>
-<body onload="document.nps.submit();">
-	<form name="nps" action="'.$strRequestUrl.'" method="post">
-	</form>
-</body>
-</html>';
-exit;
-?>

public/user/inc/config_pay_tenpay.php

@@ -1,90 +0,0 @@
-<?php 
-if (!defined('DEDEMEMBER')) exit('dedebiz');
-//财付通 网上支付接口
-/*这里替换为您的实际商户号*/
-$strSpid    = $payment_userid[0];
-/*strSpkey是32位商户密钥, 请替换为您的实际密钥*/
-$strSpkey   = $payment_key[0];
-/*银行类型:    
-        0        财付通
-          1001    招商银行   
-          1002    中国工商银行  
-          1003    中国建设银行  
-          1004    上海浦东发展银行   
-          1005    中国农业银行  
-          1006    中国民生银行  
-          1008    深圳发展银行   
-          1009    兴业银行   */
-if(!isset($BankType)) $BankType = 0;
-$BankType = preg_replace("#[^0-9]#","",$BankType);
-if($BankType < 1) $BankType = 0;
-$strBankType= $BankType;
-$strCmdNo   = "1";
-$strBillDate= date('Ymd');
-/*商品名称*/
-if(!isset($pname)) $pname = '服务购买';
-$strDesc    = $pname;
-/*用户QQ号码, 现在置为空串*/
-$strBuyerId = "";
-/*商户号*/
-$strSaler   = $payment_userid[0];
-//支付手续费
-if($payment_exp[0] < 0) $payment_exp[0] = 0;
-$piice_ex = $price*$payment_exp[0];
-$price         = $price+$piice_ex;
-//支付金额
-$strTotalFee = $price*100;
-if( $strTotalFee < 1){
-    $dsql->Close();
-    exit('金额不对');
-}
-$strSpBillNo = $buyid;;
-/*重要: 交易单号
-      交易单号(28位): 商户号(10位) + 日期(8位) + 流水号(10位), 必须按此格式生成, 且不能重复
-      如果sp_billno超过10位, 则截取其中的流水号部分加到transaction_id后部(不足10位左补0)
-      如果sp_billno不足10位, 则左补0, 加到transaction_id后部*/
-$strTransactionId = $strSpid.$strBillDate.time();
-/*货币类型: 1 – RMB(人民币) 2 - USD(美元) 3 - HKD(港币)*/
-$strFeeType  = "1";
-/*财付通回调页面地址, 推荐使用ip地址的方式(最长255个字符)*/
-$strRetUrl  = $cfg_basehost."/user/paycenter/tenpay/notify_handler.php";
-/*商户私有数据, 请求回调页面时原样返回*/
-$strAttach  = "my_magic_string";
-/*生成MD5签名*/
-$strSignText = "cmdno=".$strCmdNo."&date=".$strBillDate."&bargainor_id=".$strSaler .
-          "&transaction_id=".$strTransactionId."&sp_billno=".$strSpBillNo.       
-          "&total_fee=".$strTotalFee."&fee_type=".$strFeeType."&return_url=".$strRetUrl .
-          "&attach=".$strAttach."&key=".$strSpkey;
-$strSign = strtoupper(md5($strSignText));
-/*请求支付串*/
-$strRequest = "cmdno=".$strCmdNo."&date=".$strBillDate."&bargainor_id=".$strSaler.       
-"&transaction_id=".$strTransactionId."&sp_billno=".$strSpBillNo.       
-"&total_fee=".$strTotalFee."&fee_type=".$strFeeType."&return_url=".$strRetUrl.       
-"&attach=".$strAttach."&bank_type=".$strBankType."&desc=".$strDesc.       
-"&purchaser_id=".$strBuyerId.       
-"&sign=".$strSign ;
-$strRequestUrl = "https://www.tenpay.com/cgi-bin/v1.0/pay_gate.cgi?".$strRequest;
-if($cfg_soft_lang == 'utf-8')
-{
-    $strRequestUrl = utf82gb($strRequestUrl);    
-    echo '<html>
-    <head>
-        <title>转到财付通支付页面</title>
-    </head>
-    <body onload="document.tenpay.submit();">
-        <form name="tenpay" action="paycenter/tenpay/tenpay_gbk_page.php?strReUrl='.urlencode($strRequestUrl).'" method="post">
-        </form>
-    </body>
-    </html>';    
-} else {
-    echo '<html>
-    <head>
-        <title>转到财付通支付页面</title>
-    </head>
-    <body onload="document.tenpay.submit();">
-        <form name="tenpay" action="'.$strRequestUrl.'" method="post">
-        </form>
-    </body>
-    </html>';
-}
-exit;

public/user/inc/config_pay_yeepay.php

@@ -1,63 +0,0 @@
-<?php
-if (!defined('DEDEMEMBER')) exit('dedebiz');
-include_once DEDEMEMBER.'/paycenter/yeepay/yeepay_config.php';
-if($payment_exp[4] < 0) $payment_exp[4] = 0;
-$piice_ex = $price*$payment_exp[4];
-if($piice_ex > 0) $price = $price+$piice_ex;
-#	商家设置用户购买商品的支付信息.
-##易宝支付平台统一使用GBK/GB2312编码方式,参数如用到中文，请注意转码
-#	商户订单号,选填.
-##若不为""，提交的订单号必须在自身账户交易中唯一;为""时，易宝支付会自动生成随机的商户订单号.
-$p2_Order					= trim($buyid);
-#	支付金额,必填.
-##单位:元，精确到分.
-$p3_Amt						= $price;
-#	交易币种,固定值"CNY".
-$p4_Cur						= "CNY";
-#	商品名称
-##用于支付时显示在易宝支付网关左侧的订单产品信息.
-$p5_Pid						= trim($pname);
-#	商品种类
-$p6_Pcat					= trim($ptype);
-#	商品描述
-$p7_Pdesc					= '';
-#	商户接收支付成功数据的地址,支付成功后易宝支付会向该地址发送两次成功通知.
-$p8_Url						= $cfg_basehost.'/user/paycenter/yeepay/callback.php';	
-#	商户扩展信息
-##商户可以任意填写1K 的字符串,支付成功时将原样返回.												
-$pa_MP						= 'member';
-#	应答机制
-##为"1": 需要应答机制;为"0": 不需要应答机制.
-$pr_NeedResponse	= 1;
-#	银行编码
-##默认为""，到易宝支付网关.若不需显示易宝支付的页面，直接跳转到各银行、神州行支付、骏网一卡通等支付页面，该字段可依照附录:银行列表设置参数值.
-$pd_FrpId					= '';
-#调用签名函数生成签名串
-$hmac = getReqHmacString($p2_Order,$p3_Amt,$p4_Cur,$p5_Pid,$p6_Pcat,$p7_Pdesc,$p8_Url,$pa_MP,$pd_FrpId,$pr_NeedResponse);	
-$reqURL_onLineCmd = 'paycenter/yeepay/yeepay_gbk.php';
-echo '
-<html>
-<head>
-<title>To YeePay Page</title>
-<body onload="document.yeepay.submit();">
-<form name="yeepay" action="'.$reqURL_onLineCmd.'" method="post">
-<input type="hidden" name="p0_Cmd"					value="'.$p0_Cmd.'">
-<input type="hidden" name="p1_MerId"				value="'.$p1_MerId.'">
-<input type="hidden" name="p2_Order"				value="'.$p2_Order.'">
-<input type="hidden" name="p3_Amt"					value="'.$p3_Amt.'">
-<input type="hidden" name="p4_Cur"					value="'.$p4_Cur.'">
-<input type="hidden" name="p5_Pid"					value="'.$p5_Pid.'">
-<input type="hidden" name="p6_Pcat"					value="'.$p6_Pcat.'">
-<input type="hidden" name="p7_Pdesc"				value="'.$p7_Pdesc.'">
-<input type="hidden" name="p8_Url"					value="'.$p8_Url.'">
-<input type="hidden" name="p9_SAF"					value="'.$p9_SAF.'">
-<input type="hidden" name="pa_MP"					value="'.$pa_MP.'">
-<input type="hidden" name="pd_FrpId"				value="'.$pd_FrpId.'">
-<input type="hidden" name="pr_NeedResponse"	value="'.$pr_NeedResponse.'">
-<input type="hidden" name="hmac"					value="'.$hmac.'">
-<input type="hidden" name="lang"					value="'.$cfg_soft_lang.'">
-<input type="hidden" name="reqURL_onLine"					value="'.$reqURL_onLine.'">
-</form>
-</body>
-</html>';exit;
-?>

public/admin/ad_add.php → src/admin/ad_add.php

@@ -10,7 +10,7 @@
  */
 require(dirname(__FILE__)."/config.php");
 CheckPurview('plus_广告管理');
-require_once DEDEINC."/typelink.class.php";
+require_once DEDEINC."/typelink/typelink.class.php";
 if (empty($dopost)) $dopost = "";
 if ($dopost == "save") {
     CheckCSRF();

public/admin/ad_edit.php → src/admin/ad_edit.php

@@ -10,7 +10,7 @@
  */
 require(dirname(__FILE__)."/config.php");
 CheckPurview('plus_广告管理');
-require_once(DEDEINC.'/typelink.class.php');
+require_once(DEDEINC.'/typelink/typelink.class.php');
 if (empty($dopost)) $dopost = '';
 $aid = preg_replace("#[^0-9]#", '', $aid);
 $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? "ad_main.php" : $_COOKIE['ENV_GOBACK_URL'];

public/admin/album_add.php → src/admin/album_add.php

@@ -133,7 +133,7 @@ else if ($dopost == 'save') {
     处理从ZIP中解压的图片
     ---------------------*/
     if ($formzip == 1) {
-        include_once(DEDEINC."/zip.class.php");
+        include_once(DEDEINC."/libraries/zip.class.php");
         include_once(DEDEADMIN."/file_class.php");
         $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile);
         $tmpzipdir = DEDEDATA.'/ziptmp/'.cn_substr(md5(ExecTime()), 16);

public/admin/album_edit.php → src/admin/album_edit.php

@@ -228,7 +228,7 @@ else if ($dopost == 'save') {
     从ZIP文件中获取新图片
     ---------------------*/
     if ($formzip == 1) {
-        include_once(DEDEINC."/zip.class.php");
+        include_once(DEDEINC."/libraries/zip.class.php");
         include_once(DEDEADMIN."/file_class.php");
         $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile);
         $tmpzipdir = DEDEDATA.'/ziptmp/'.cn_substr(md5(ExecTime()), 16);

public/admin/archives_do.php → src/admin/archives_do.php

@@ -11,8 +11,8 @@
 require_once(dirname(__FILE__).'/config.php');
 require_once(DEDEADMIN.'/inc/inc_batchup.php');
 require_once(DEDEADMIN.'/inc/inc_archives_functions.php');
-require_once(DEDEINC.'/typelink.class.php');
-require_once(DEDEINC.'/arc.archives.class.php');
+require_once(DEDEINC.'/typelink/typelink.class.php');
+require_once(DEDEINC.'/archive/archives.class.php');
 $ENV_GOBACK_URL = (empty($_COOKIE['ENV_GOBACK_URL']) ? 'content_list.php' : $_COOKIE['ENV_GOBACK_URL']);
 if (empty($dopost)) {
     ShowMsg('对不起，您没指定运行参数', '-1');
@@ -295,7 +295,7 @@ function moveArchives(){ }
 else if ($dopost == 'moveArchives') {
     CheckPurview('sys_ArcBatch');
     if (empty($totype)) {
-        require_once(DEDEINC.'/typelink.class.php');
+        require_once(DEDEINC.'/typelink/typelink.class.php');
         if (!empty($aid) && empty($qstr)) $qstr = $aid;
         AjaxHead();
         $channelid = empty($channelid) ? 0 : $channelid;
@@ -683,7 +683,7 @@ else if ($dopost == "makekw") {
         }
         $client->Close();
     } else {
-        include_once(DEDEINC.'/splitword.class.php');
+        include_once(DEDEINC.'/libraries/splitword.class.php');
         $sp = new SplitWord($cfg_soft_lang, $cfg_soft_lang);
         while ($row = $dsql->GetArray()) {
             //跳过已经有关键字的内容
@@ -871,7 +871,7 @@ else if ($dopost == 'attsDlg') {
 function getCatMap() {  }
 -------------------------*/
 else if ($dopost == 'getCatMap') {
-    require_once(DEDEINC.'/typeunit.class.selector.php');
+    require_once(DEDEINC.'/typelink/typeunit.class.selector.php');
     AjaxHead();
     //输出AJAX可移动窗体
     $divname = 'getCatMap';

public/admin/article_keywords_make.php → src/admin/article_keywords_make.php

@@ -82,7 +82,7 @@ if ($dopost == 'analyse') {
 }
 //自动获取关键字（适用于默认的文章模型）
 else if ($dopost == 'fetch') {
-    require_once(DEDEINC."/splitword.class.php");
+    require_once(DEDEINC."/libraries/splitword.class.php");
     if (empty($startdd)) {
         $startdd = 0;
     }

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

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

public/admin/catalog_add.php → src/admin/catalog_add.php

@@ -9,7 +9,7 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/config.php");
-require_once(DEDEINC."/typelink.class.php");
+require_once(DEDEINC."/typelink/typelink.class.php");
 if (empty($listtype)) $listtype = '';
 if (empty($dopost)) $dopost = '';
 if (empty($upinyin)) $upinyin = 0;

public/admin/catalog_del.php → src/admin/catalog_del.php

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__).'/config.php');
 
 //检查权限许可
 CheckPurview('t_Del,t_AccDel');
-require_once(DEDEINC.'/typeunit.class.admin.php');
+require_once(DEDEINC.'/typelink/typeunit.class.admin.php');
 require_once(DEDEINC.'/oxwindow.class.php');
 $id = trim(preg_replace("#[^0-9]#", '', $id));
 

public/admin/catalog_do.php → src/admin/catalog_do.php

@@ -92,7 +92,7 @@ else if ($dopost == "viewTemplet") {
 function ViewSgPage()
 ------------------------*/
 else if ($dopost == "viewSgPage") {
-    require_once(DEDEINC."/arc.listview.class.php");
+    require_once(DEDEINC."/archive/listview.class.php");
     $lv = new ListView($cid);
     $pageurl = $lv->MakeHtml();
     ShowMsg("更新缓冲，请稍后", $pageurl);
@@ -181,7 +181,7 @@ function GetSunListsMenu();
 -----------*/
 else if ($dopost == "GetSunListsMenu") {
     $userChannel = $cuserLogin->getUserChannel();
-    require_once(DEDEINC."/typeunit.class.menu.php");
+    require_once(DEDEINC."/typeunit/typeunit.class.menu.php");
     AjaxHead();
     PutCookie('lastCidMenu', $cid, 3600 * 24, "/");
     $tu = new TypeUnit($userChannel);
@@ -192,7 +192,7 @@ else if ($dopost == "GetSunListsMenu") {
 function GetSunLists();
 -----------*/
 else if ($dopost == "GetSunLists") {
-    require_once(DEDEINC."/typeunit.class.admin.php");
+    require_once(DEDEINC."/typelink/typeunit.class.admin.php");
     AjaxHead();
     PutCookie('lastCid', $cid, 3600 * 24, "/");
     $tu = new TypeUnit();
@@ -209,7 +209,7 @@ function unitCatalog() { }
 else if ($dopost == 'unitCatalog') {
     CheckPurview('t_Move');
     require_once(DEDEINC.'/oxwindow.class.php');
-    require_once(DEDEINC.'/typelink.class.php');
+    require_once(DEDEINC.'/typelink/typelink.class.php');
     require_once(DEDEINC.'/channelunit.func.php');
     if (empty($nextjob)) {
         $typeid = isset($typeid) ? intval($typeid) : 0;
@@ -268,7 +268,7 @@ function moveCatalog() { }
 else if ($dopost == 'moveCatalog') {
     CheckPurview('t_Move');
     require_once(DEDEINC.'/oxwindow.class.php');
-    require_once(DEDEINC.'/typelink.class.php');
+    require_once(DEDEINC.'/typelink/typelink.class.php');
     require_once(DEDEINC.'/channelunit.func.php');
     if (empty($nextjob)) {
         $tl = new TypeLink($typeid);

public/admin/catalog_edit.php → src/admin/catalog_edit.php

@@ -9,7 +9,7 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/config.php");
-require_once(DEDEINC."/typelink.class.php");
+require_once(DEDEINC."/typelink/typelink.class.php");
 if (empty($dopost)) $dopost = '';
 $id = isset($id) ? intval($id) : 0;
 //检查权限许可

public/admin/catalog_main.php → src/admin/catalog_main.php

@@ -9,6 +9,6 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/config.php");
-require_once(DEDEINC."/typeunit.class.admin.php");
+require_once(DEDEINC."/typelink/typeunit.class.admin.php");
 $userChannel = $cuserLogin->getUserChannel();
 include DedeInclude('templets/catalog_main.htm');

public/admin/catalog_menu.php → src/admin/catalog_menu.php

@@ -9,7 +9,7 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/config.php");
-require_once(DEDEINC."/typeunit.class.menu.php");
+require_once(DEDEINC."/typeunit/typeunit.class.menu.php");
 $userChannel = $cuserLogin->getUserChannel();
 if (empty($opendir)) $opendir = -1;
 if ($userChannel > 0) $opendir = $userChannel;

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

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

public/admin/content_batch_up.php → src/admin/content_batch_up.php

@@ -9,5 +9,5 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__).'/config.php');
-require_once(DEDEINC.'/typelink.class.php');
+require_once(DEDEINC.'/typelink/typelink.class.php');
 include DedeInclude('templets/content_batch_up.htm');

public/admin/content_batchup_action.php → src/admin/content_batchup_action.php

@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_ArcBatch');
-require_once(DEDEINC."/typelink.class.php");
+require_once(DEDEINC."/typelink/typelink.class.php");
 require_once(DEDEADMIN."/inc/inc_batchup.php");
 @set_time_limit(0);
 //typeid,startid,endid,seltime,starttime,endtime,action,newtypeid

public/admin/content_list.php → src/admin/content_list.php

@@ -11,7 +11,7 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__).'/config.php');
-require_once(DEDEINC.'/typelink.class.php');
+require_once(DEDEINC.'/typelink/typelink.class.php');
 require_once(DEDEINC.'/datalistcp.class.php');
 require_once(DEDEADMIN.'/inc/inc_list_functions.php');
 $cid = isset($cid) ? intval($cid) : 0;

public/admin/content_sg_list.php → src/admin/content_sg_list.php

@@ -31,7 +31,7 @@ if (TestPurview('a_List')) {
 }
 $adminid = $cuserLogin->getUserID();
 $maintable = '#@__archives';
-require_once(DEDEINC."/typelink.class.php");
+require_once(DEDEINC."/typelink/typelink.class.php");
 require_once(DEDEINC."/datalistcp.class.php");
 require_once(DEDEADMIN."/inc/inc_list_functions.php");
 setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/");

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

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