From 4cf1b740e45172d33504beba0c8ce31527a112d3 Mon Sep 17 00:00:00 2001 From: sunhao Date: Fri, 5 May 2023 14:57:00 +0800 Subject: [PATCH] * zin: refactor import paths --- zin/core/context.class.php | 2 +- zin/core/context.func.php | 2 +- zin/core/directive.class.php | 2 +- zin/core/dom.class.php | 2 +- zin/core/h.class.php | 4 ++-- zin/core/h.func.php | 14 +++++++------- zin/core/item.class.php | 4 ++-- zin/core/on.class.php | 2 +- zin/core/portal.class.php | 2 +- zin/core/render.func.php | 2 +- zin/core/set.class.php | 2 +- zin/core/to.class.php | 2 +- zin/core/wg.class.php | 12 ++++++------ zin/core/wg.func.php | 8 ++++---- zin/helper.php | 2 +- zin/utils/data.class.php | 2 +- zin/utils/hx.class.php | 2 +- zin/utils/style.class.php | 2 +- zin/zentao/zentao.func.php | 2 +- zin/zui/toggle.class.php | 2 +- zin/zui/zui.class.php | 4 ++-- zin/zui/zui.func.php | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) diff --git a/zin/core/context.class.php b/zin/core/context.class.php index 76ad849d2c..711eb73931 100644 --- a/zin/core/context.class.php +++ b/zin/core/context.class.php @@ -13,7 +13,7 @@ namespace zin; require_once dirname(__DIR__) . DS . 'utils' . DS . 'dataset.class.php'; require_once dirname(__DIR__) . DS . 'utils' . DS . 'flat.func.php'; -require_once 'portal.class.php'; +require_once __DIR__ . DS . 'portal.class.php'; class context extends \zin\utils\dataset { diff --git a/zin/core/context.func.php b/zin/core/context.func.php index 5d7a770644..7a180bb7fa 100644 --- a/zin/core/context.func.php +++ b/zin/core/context.func.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'context.class.php'; +require_once __DIR__ . DS . 'context.class.php'; function portal(/* string $name, mixed ...$children */) { diff --git a/zin/core/directive.class.php b/zin/core/directive.class.php index 7e96de8194..9aee815f3e 100644 --- a/zin/core/directive.class.php +++ b/zin/core/directive.class.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'zin.class.php'; +require_once __DIR__ . DS . 'zin.class.php'; class directive { diff --git a/zin/core/dom.class.php b/zin/core/dom.class.php index 711f7b0b1c..722a129bde 100644 --- a/zin/core/dom.class.php +++ b/zin/core/dom.class.php @@ -12,7 +12,7 @@ namespace zin; require_once dirname(__DIR__) . DS . 'utils' . DS . 'deep.func.php'; -require_once 'selector.func.php'; +require_once __DIR__ . DS . 'selector.func.php'; class dom { diff --git a/zin/core/h.class.php b/zin/core/h.class.php index 967a6a0db2..b51ba4898e 100644 --- a/zin/core/h.class.php +++ b/zin/core/h.class.php @@ -12,8 +12,8 @@ namespace zin; require_once dirname(__DIR__) . DS . 'utils' . DS . 'flat.func.php'; -require_once 'wg.class.php'; -require_once 'wg.func.php'; +require_once __DIR__ . DS . 'wg.class.php'; +require_once __DIR__ . DS . 'wg.func.php'; class h extends wg { diff --git a/zin/core/h.func.php b/zin/core/h.func.php index 983112a15e..589be4862c 100644 --- a/zin/core/h.func.php +++ b/zin/core/h.func.php @@ -11,13 +11,13 @@ namespace zin; -require_once 'h.class.php'; -require_once 'item.class.php'; -require_once 'wg.func.php'; -require_once 'set.class.php'; -require_once 'to.class.php'; -require_once 'data.func.php'; -require_once 'on.class.php'; +require_once __DIR__ . DS . 'h.class.php'; +require_once __DIR__ . DS . 'item.class.php'; +require_once __DIR__ . DS . 'wg.func.php'; +require_once __DIR__ . DS . 'set.class.php'; +require_once __DIR__ . DS . 'to.class.php'; +require_once __DIR__ . DS . 'data.func.php'; +require_once __DIR__ . DS . 'on.class.php'; function h() {return call_user_func_array('\zin\h::create', func_get_args());} diff --git a/zin/core/item.class.php b/zin/core/item.class.php index 4eec23e72d..9f8e001948 100644 --- a/zin/core/item.class.php +++ b/zin/core/item.class.php @@ -11,8 +11,8 @@ namespace zin; -require_once 'wg.class.php'; -require_once 'wg.func.php'; +require_once __DIR__ . DS . 'wg.class.php'; +require_once __DIR__ . DS . 'wg.func.php'; class item extends wg { diff --git a/zin/core/on.class.php b/zin/core/on.class.php index 7990c3ea50..cdd55d3c37 100644 --- a/zin/core/on.class.php +++ b/zin/core/on.class.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'wg.func.php'; +require_once __DIR__ . DS . 'wg.func.php'; class on { diff --git a/zin/core/portal.class.php b/zin/core/portal.class.php index 0d306bcbe9..726677bac8 100644 --- a/zin/core/portal.class.php +++ b/zin/core/portal.class.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'wg.class.php'; +require_once __DIR__ . DS . 'wg.class.php'; class portal extends wg { diff --git a/zin/core/render.func.php b/zin/core/render.func.php index 09c9ffe1a3..e8676e84a5 100644 --- a/zin/core/render.func.php +++ b/zin/core/render.func.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'zin.class.php'; +require_once __DIR__ . DS . 'zin.class.php'; /** * Render page content with a widget to HTML. diff --git a/zin/core/set.class.php b/zin/core/set.class.php index db7d10f589..c711d4c8d3 100644 --- a/zin/core/set.class.php +++ b/zin/core/set.class.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'directive.class.php'; +require_once __DIR__ . DS . 'directive.class.php'; class set { diff --git a/zin/core/to.class.php b/zin/core/to.class.php index b54f50ad44..c4ca9d27f1 100644 --- a/zin/core/to.class.php +++ b/zin/core/to.class.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'directive.class.php'; +require_once __DIR__ . DS . 'directive.class.php'; class to { diff --git a/zin/core/wg.class.php b/zin/core/wg.class.php index 315aa4d56c..ff167c1d63 100644 --- a/zin/core/wg.class.php +++ b/zin/core/wg.class.php @@ -11,12 +11,12 @@ namespace zin; -require_once 'props.class.php'; -require_once 'directive.class.php'; -require_once 'zin.class.php'; -require_once 'context.class.php'; -require_once 'selector.func.php'; -require_once 'dom.class.php'; +require_once __DIR__ . DS . 'props.class.php'; +require_once __DIR__ . DS . 'directive.class.php'; +require_once __DIR__ . DS . 'zin.class.php'; +require_once __DIR__ . DS . 'context.class.php'; +require_once __DIR__ . DS . 'selector.func.php'; +require_once __DIR__ . DS . 'dom.class.php'; class wg { diff --git a/zin/core/wg.func.php b/zin/core/wg.func.php index bfa9a00096..60351dd966 100644 --- a/zin/core/wg.func.php +++ b/zin/core/wg.func.php @@ -11,10 +11,10 @@ namespace zin; require_once dirname(__DIR__) . DS . 'utils' . DS . 'flat.func.php'; -require_once 'props.class.php'; -require_once 'directive.class.php'; -require_once 'wg.class.php'; -require_once 'context.func.php'; +require_once __DIR__ . DS . 'props.class.php'; +require_once __DIR__ . DS . 'directive.class.php'; +require_once __DIR__ . DS . 'wg.class.php'; +require_once __DIR__ . DS . 'context.func.php'; function set($name, $value = NULL) { diff --git a/zin/helper.php b/zin/helper.php index 555d71bee2..1e05922472 100755 --- a/zin/helper.php +++ b/zin/helper.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'config.php'; +require_once __DIR__ . DS . 'config.php'; function setWgVer($ver, $names = NULL) { diff --git a/zin/utils/data.class.php b/zin/utils/data.class.php index aa85246f8c..20c94df25a 100644 --- a/zin/utils/data.class.php +++ b/zin/utils/data.class.php @@ -11,7 +11,7 @@ namespace zin\utils; -require_once 'dataset.class.php'; +require_once __DIR__ . DS . 'dataset.class.php'; /** * Manage data for html element and widgets diff --git a/zin/utils/hx.class.php b/zin/utils/hx.class.php index 3eed344b8b..cb8d5b5b28 100755 --- a/zin/utils/hx.class.php +++ b/zin/utils/hx.class.php @@ -11,7 +11,7 @@ namespace zin\utils; -require_once 'dataset.class.php'; +require_once __DIR__ . DS . 'dataset.class.php'; /** * Manage hx for html element and widgets diff --git a/zin/utils/style.class.php b/zin/utils/style.class.php index 09c48d65c0..1679347291 100755 --- a/zin/utils/style.class.php +++ b/zin/utils/style.class.php @@ -11,7 +11,7 @@ namespace zin\utils; -require_once 'dataset.class.php'; +require_once __DIR__ . DS . 'dataset.class.php'; /** * Manage style for html element and widgets diff --git a/zin/zentao/zentao.func.php b/zin/zentao/zentao.func.php index 99a79b61d2..ecbd68c479 100644 --- a/zin/zentao/zentao.func.php +++ b/zin/zentao/zentao.func.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'pager.func.php'; +require_once __DIR__ . DS . 'pager.func.php'; class helper extends \helper { diff --git a/zin/zui/toggle.class.php b/zin/zui/toggle.class.php index 91c0b88378..ed9559f21a 100644 --- a/zin/zui/toggle.class.php +++ b/zin/zui/toggle.class.php @@ -11,7 +11,7 @@ namespace zin; -require_once 'toggle.func.php'; +require_once __DIR__ . DS . 'toggle.func.php'; class toggle { diff --git a/zin/zui/zui.class.php b/zin/zui/zui.class.php index 6e011219ea..aed963f33c 100644 --- a/zin/zui/zui.class.php +++ b/zin/zui/zui.class.php @@ -14,8 +14,8 @@ namespace zin; require_once dirname(__DIR__) . DS . 'core' . DS . 'wg.class.php'; require_once dirname(__DIR__) . DS . 'core' . DS . 'wg.func.php'; require_once dirname(__DIR__) . DS . 'core' . DS . 'wg.func.php'; -require_once 'toggle.func.php'; -require_once 'toggle.class.php'; +require_once __DIR__ . DS . 'toggle.func.php'; +require_once __DIR__ . DS . 'toggle.class.php'; class zui extends wg { diff --git a/zin/zui/zui.func.php b/zin/zui/zui.func.php index 60ef2c8cc4..aaeac4b741 100644 --- a/zin/zui/zui.func.php +++ b/zin/zui/zui.func.php @@ -1,7 +1,7 @@