diff --git a/README.md b/README.md index ee5a945342d253eb49ca75603a867f9834d3ce57..6c41316c055bfd01b3e53e3f241122c2a835e01f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -ThinkCMF 6.0.7 让你更自由地飞 +ThinkCMF 6.0.8 开发版 =============== -欢迎入坑，有问题请及时提交issue! +**`6.0.8`正在紧张开发中，请不要用于正式环境！实际项目请下载最新正式版`6.0.7`** + ### 主要特性 * 框架协议依旧为`MIT`,让你更自由地飞 @@ -120,6 +121,9 @@ https://gitee.com/thinkcmf/docker 5. `composer update` ### 更新日志 +#### 6.0.8 coding~ +* ... + #### 6.0.7 * 升级到`tp6.0.13` * 增加安装时检查API配置 diff --git a/composer.lock b/composer.lock index 053cb14f51697f759350d0d846ccf8260465f500..e3ba31c32e62bcb27e166a914f166b3886e31ad5 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "chamilo/pclzip", - "version": "v2.8.4", + "version": "v2.8.5", "source": { "type": "git", "url": "https://github.com/chamilo/pclzip.git", - "reference": "b94b7a190e186a31bd37f21be3a83a48c7d6b49a" + "reference": "af10d07a39922b0789bf761524a22ecefc01d405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chamilo/pclzip/zipball/b94b7a190e186a31bd37f21be3a83a48c7d6b49a", - "reference": "b94b7a190e186a31bd37f21be3a83a48c7d6b49a", + "url": "https://api.github.com/repos/chamilo/pclzip/zipball/af10d07a39922b0789bf761524a22ecefc01d405", + "reference": "af10d07a39922b0789bf761524a22ecefc01d405", "shasum": "" }, "replace": { @@ -46,52 +46,9 @@ ], "support": { "issues": "https://github.com/chamilo/pclzip/issues", - "source": "https://github.com/chamilo/pclzip/tree/v2.8.4" + "source": "https://github.com/chamilo/pclzip/tree/v2.8.5" }, - "time": "2017-11-28T22:14:11+00:00" - }, - { - "name": "electrolinux/phpquery", - "version": "0.9.6", - "source": { - "type": "git", - "url": "https://github.com/electrolinux/phpquery.git", - "reference": "6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/electrolinux/phpquery/zipball/6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a", - "reference": "6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a", - "shasum": "" - }, - "type": "library", - "autoload": { - "classmap": [ - "phpQuery/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobiasz Cudnik", - "email": "tobiasz.cudnik@gmail.com", - "homepage": "https://github.com/TobiaszCudnik", - "role": "Developer" - }, - { - "name": "didier Belot", - "role": "Packager" - } - ], - "description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library", - "homepage": "http://code.google.com/p/phpquery/", - "support": { - "source": "https://github.com/electrolinux/phpquery/tree/0.9.6" - }, - "time": "2013-03-21T12:39:33+00:00" + "time": "2022-09-06T21:41:44+00:00" }, { "name": "ezyang/htmlpurifier", @@ -399,18 +356,65 @@ }, "time": "2022-07-16T15:11:03+00:00" }, + { + "name": "obsoletepackage/phpquery", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/ObsoletePackage/phpquery.git", + "reference": "ebe03fabd3286fdad18a0148a5f23f6dcc0443fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ObsoletePackage/phpquery/zipball/ebe03fabd3286fdad18a0148a5f23f6dcc0443fb", + "reference": "ebe03fabd3286fdad18a0148a5f23f6dcc0443fb", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "phpQuery/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobiasz Cudnik", + "email": "tobiasz.cudnik@gmail.com", + "homepage": "https://github.com/TobiaszCudnik", + "role": "Developer" + }, + { + "name": "didier Belot", + "role": "Packager" + }, + { + "name": "obsolete package", + "homepage": "https://github.com/ObsoletePackage" + } + ], + "description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library", + "homepage": "http://code.google.com/p/phpquery/", + "support": { + "source": "https://github.com/ObsoletePackage/phpquery/tree/1.0.2" + }, + "time": "2022-08-21T10:51:36+00:00" + }, { "name": "phpmailer/phpmailer", - "version": "v6.6.3", + "version": "v6.6.4", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "9400f305a898f194caff5521f64e5dfa926626f3" + "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3", - "reference": "9400f305a898f194caff5521f64e5dfa926626f3", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a94fdebaea6bd17f51be0c2373ab80d3d681269b", + "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b", "shasum": "" }, "require": { @@ -467,7 +471,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.4" }, "funding": [ { @@ -475,7 +479,7 @@ "type": "github" } ], - "time": "2022-06-20T09:21:02+00:00" + "time": "2022-08-22T09:22:00+00:00" }, { "name": "psr/cache", @@ -730,22 +734,22 @@ }, { "name": "thinkcmf/cmf", - "version": "v6.0.16", + "version": "v6.0.17", "source": { "type": "git", "url": "https://github.com/thinkcmf/cmf-core.git", - "reference": "bb02d518e7ee8c19442ddd88a45abcbc8cfb00a8" + "reference": "97681cdb9a205ab6c4fca0cfcca1b26b1c185712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thinkcmf/cmf-core/zipball/bb02d518e7ee8c19442ddd88a45abcbc8cfb00a8", - "reference": "bb02d518e7ee8c19442ddd88a45abcbc8cfb00a8", + "url": "https://api.github.com/repos/thinkcmf/cmf-core/zipball/97681cdb9a205ab6c4fca0cfcca1b26b1c185712", + "reference": "97681cdb9a205ab6c4fca0cfcca1b26b1c185712", "shasum": "" }, "require": { - "electrolinux/phpquery": "^0.9.6", "ezyang/htmlpurifier": "^4.9", "mindplay/annotations": "^1.3", + "obsoletepackage/phpquery": "^1.0.1", "phpmailer/phpmailer": "~6.0", "thinkcmf/cmf-captcha": "^3.0", "thinkcmf/cmf-extend": "~5.1.0", @@ -787,9 +791,9 @@ "description": "The ThinkCMF Core Package", "support": { "issues": "https://github.com/thinkcmf/cmf-core/issues", - "source": "https://github.com/thinkcmf/cmf-core/tree/v6.0.16" + "source": "https://github.com/thinkcmf/cmf-core/tree/v6.0.17" }, - "time": "2022-07-22T02:27:15+00:00" + "time": "2022-08-05T14:59:02+00:00" }, { "name": "thinkcmf/cmf-api", diff --git a/public/themes/admin_simpleboot3/admin/user/add.html b/public/themes/admin_simpleboot3/admin/user/add.html index a29c960d5932a55e9c893e4bd59ef34625a4a17c..baa40fd0ce5479e169074a662e893aafa1387762 100755 --- a/public/themes/admin_simpleboot3/admin/user/add.html +++ b/public/themes/admin_simpleboot3/admin/user/add.html @@ -37,6 +37,7 @@
+
diff --git a/public/themes/admin_simpleboot3/admin/user/edit.html b/public/themes/admin_simpleboot3/admin/user/edit.html index 82478fb5d5d69ee57f1691ca64aa67d30bddbbdd..215a314ee9689542926e32ea4e94b9de2f0b4268 100755 --- a/public/themes/admin_simpleboot3/admin/user/edit.html +++ b/public/themes/admin_simpleboot3/admin/user/edit.html @@ -40,6 +40,7 @@
+ {:lang('BACK')}
diff --git a/vendor/chamilo/pclzip/pclzip.lib.php b/vendor/chamilo/pclzip/pclzip.lib.php index 976a9255801f1e010ad3a66e391cef4abf87e1ff..869a9435fc3683dd52f596522477da626a1c3d84 100644 --- a/vendor/chamilo/pclzip/pclzip.lib.php +++ b/vendor/chamilo/pclzip/pclzip.lib.php @@ -1,6 +1,6 @@ $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackBody' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackParam' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackParameterToReference' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackReturnReference' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackReturnValue' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', + 'Callback' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackBody' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackParam' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackParameterToReference' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackReturnReference' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackReturnValue' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', - 'DOMDocumentWrapper' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php', - 'DOMEvent' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/DOMEvent.php', - 'ICallbackNamed' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', + 'DOMDocumentWrapper' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php', + 'DOMEvent' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/DOMEvent.php', + 'ICallbackNamed' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', 'PclZip' => $vendorDir . '/chamilo/pclzip/pclzip.lib.php', - 'phpQuery' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery.php', - 'phpQueryEvents' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/phpQueryEvents.php', - 'phpQueryObject' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/phpQueryObject.php', - 'phpQueryObjectPlugin_Scripts' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts.php', - 'phpQueryObjectPlugin_WebBrowser' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', - 'phpQueryObjectPlugin_example' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/example.php', - 'phpQueryPlugin_Scripts' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts.php', - 'phpQueryPlugin_WebBrowser' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', - 'phpQueryPlugin_example' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/example.php', - 'phpQueryPlugins' => $vendorDir . '/electrolinux/phpquery/phpQuery/phpQuery.php', + 'phpQuery' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery.php', + 'phpQueryEvents' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/phpQueryEvents.php', + 'phpQueryObject' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/phpQueryObject.php', + 'phpQueryObjectPlugin_Scripts' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts.php', + 'phpQueryObjectPlugin_WebBrowser' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', + 'phpQueryObjectPlugin_example' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/example.php', + 'phpQueryPlugin_Scripts' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts.php', + 'phpQueryPlugin_WebBrowser' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', + 'phpQueryPlugin_example' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/example.php', + 'phpQueryPlugins' => $vendorDir . '/obsoletepackage/phpquery/phpQuery/phpQuery.php', 'think\\App' => $vendorDir . '/thinkcmf/cmf/think/App.php', 'think\\Console' => $vendorDir . '/thinkcmf/cmf/think/Console.php', 'think\\Http' => $vendorDir . '/thinkcmf/cmf/think/Http.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index 0ca6556dc3908ca0c549e261ef08963a8cc554b6..2ec2895e0a6e98df3b822c557e734df6aac673d9 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -11,7 +11,7 @@ return array( 'think\\trace\\' => array($vendorDir . '/topthink/think-trace/src'), 'think\\migration\\' => array($vendorDir . '/xia/migration/src'), 'think\\captcha\\' => array($vendorDir . '/thinkcmf/cmf-captcha/src'), - 'think\\' => array($vendorDir . '/topthink/framework/src/think', $vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src', $vendorDir . '/thinkcmf/cmf/think'), + 'think\\' => array($vendorDir . '/thinkcmf/cmf/think', $vendorDir . '/topthink/framework/src/think', $vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src'), 'themes\\' => array($baseDir . '/public/themes'), 'plugins\\' => array($baseDir . '/public/plugins'), 'mindplay\\annotations\\' => array($vendorDir . '/mindplay/annotations/src/annotations'), @@ -19,7 +19,7 @@ return array( 'cmf\\composer\\' => array($vendorDir . '/thinkcmf/cmf-root/src'), 'cmf\\' => array($vendorDir . '/thinkcmf/cmf/src'), 'app\\admin\\' => array($vendorDir . '/thinkcmf/cmf-appstore/src'), - 'app\\' => array($baseDir . '/app', $vendorDir . '/thinkcmf/cmf-install/src', $vendorDir . '/thinkcmf/cmf-app/src'), + 'app\\' => array($baseDir . '/app', $vendorDir . '/thinkcmf/cmf-app/src', $vendorDir . '/thinkcmf/cmf-install/src'), 'api\\' => array($baseDir . '/api', $vendorDir . '/thinkcmf/cmf-api/src'), 'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'), 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 78cceef372edb07332ee57a2f68a33041390f20e..016fc2359d7cf4069ea571550f391f306111dbfd 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -91,10 +91,10 @@ class ComposerStaticInit409e436a19c882513f3c7d0ffdfd059f ), 'think\\' => array ( - 0 => __DIR__ . '/..' . '/topthink/framework/src/think', - 1 => __DIR__ . '/..' . '/topthink/think-helper/src', - 2 => __DIR__ . '/..' . '/topthink/think-orm/src', - 3 => __DIR__ . '/..' . '/thinkcmf/cmf/think', + 0 => __DIR__ . '/..' . '/thinkcmf/cmf/think', + 1 => __DIR__ . '/..' . '/topthink/framework/src/think', + 2 => __DIR__ . '/..' . '/topthink/think-helper/src', + 3 => __DIR__ . '/..' . '/topthink/think-orm/src', ), 'themes\\' => array ( @@ -127,8 +127,8 @@ class ComposerStaticInit409e436a19c882513f3c7d0ffdfd059f 'app\\' => array ( 0 => __DIR__ . '/../..' . '/app', - 1 => __DIR__ . '/..' . '/thinkcmf/cmf-install/src', - 2 => __DIR__ . '/..' . '/thinkcmf/cmf-app/src', + 1 => __DIR__ . '/..' . '/thinkcmf/cmf-app/src', + 2 => __DIR__ . '/..' . '/thinkcmf/cmf-install/src', ), 'api\\' => array ( @@ -192,27 +192,27 @@ class ComposerStaticInit409e436a19c882513f3c7d0ffdfd059f ); public static $classMap = array ( - 'Callback' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackBody' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackParam' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackParameterToReference' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackReturnReference' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', - 'CallbackReturnValue' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', + 'Callback' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackBody' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackParam' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackParameterToReference' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackReturnReference' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', + 'CallbackReturnValue' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', - 'DOMDocumentWrapper' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php', - 'DOMEvent' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/DOMEvent.php', - 'ICallbackNamed' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/Callback.php', + 'DOMDocumentWrapper' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php', + 'DOMEvent' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/DOMEvent.php', + 'ICallbackNamed' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php', 'PclZip' => __DIR__ . '/..' . '/chamilo/pclzip/pclzip.lib.php', - 'phpQuery' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery.php', - 'phpQueryEvents' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/phpQueryEvents.php', - 'phpQueryObject' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/phpQueryObject.php', - 'phpQueryObjectPlugin_Scripts' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts.php', - 'phpQueryObjectPlugin_WebBrowser' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', - 'phpQueryObjectPlugin_example' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/example.php', - 'phpQueryPlugin_Scripts' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts.php', - 'phpQueryPlugin_WebBrowser' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', - 'phpQueryPlugin_example' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery/plugins/example.php', - 'phpQueryPlugins' => __DIR__ . '/..' . '/electrolinux/phpquery/phpQuery/phpQuery.php', + 'phpQuery' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery.php', + 'phpQueryEvents' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/phpQueryEvents.php', + 'phpQueryObject' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/phpQueryObject.php', + 'phpQueryObjectPlugin_Scripts' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts.php', + 'phpQueryObjectPlugin_WebBrowser' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', + 'phpQueryObjectPlugin_example' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/example.php', + 'phpQueryPlugin_Scripts' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts.php', + 'phpQueryPlugin_WebBrowser' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php', + 'phpQueryPlugin_example' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/example.php', + 'phpQueryPlugins' => __DIR__ . '/..' . '/obsoletepackage/phpquery/phpQuery/phpQuery.php', 'think\\App' => __DIR__ . '/..' . '/thinkcmf/cmf/think/App.php', 'think\\Console' => __DIR__ . '/..' . '/thinkcmf/cmf/think/Console.php', 'think\\Http' => __DIR__ . '/..' . '/thinkcmf/cmf/think/Http.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index dcf0ef7c20908f3d49445cde8dc2f301f6d96980..7e4f449711becc349977e841124188b8cc402603 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,23 +2,23 @@ "packages": [ { "name": "chamilo/pclzip", - "version": "v2.8.4", - "version_normalized": "2.8.4.0", + "version": "v2.8.5", + "version_normalized": "2.8.5.0", "source": { "type": "git", "url": "https://github.com/chamilo/pclzip.git", - "reference": "b94b7a190e186a31bd37f21be3a83a48c7d6b49a" + "reference": "af10d07a39922b0789bf761524a22ecefc01d405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chamilo/pclzip/zipball/b94b7a190e186a31bd37f21be3a83a48c7d6b49a", - "reference": "b94b7a190e186a31bd37f21be3a83a48c7d6b49a", + "url": "https://api.github.com/repos/chamilo/pclzip/zipball/af10d07a39922b0789bf761524a22ecefc01d405", + "reference": "af10d07a39922b0789bf761524a22ecefc01d405", "shasum": "" }, "replace": { "pclzip/pclzip": "^2.8" }, - "time": "2017-11-28T22:14:11+00:00", + "time": "2022-09-06T21:41:44+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -43,56 +43,10 @@ ], "support": { "issues": "https://github.com/chamilo/pclzip/issues", - "source": "https://github.com/chamilo/pclzip/tree/v2.8.4" + "source": "https://github.com/chamilo/pclzip/tree/v2.8.5" }, "install-path": "../chamilo/pclzip" }, - { - "name": "electrolinux/phpquery", - "version": "0.9.6", - "version_normalized": "0.9.6.0", - "source": { - "type": "git", - "url": "https://github.com/electrolinux/phpquery.git", - "reference": "6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/electrolinux/phpquery/zipball/6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a", - "reference": "6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a", - "shasum": "" - }, - "time": "2013-03-21T12:39:33+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "classmap": [ - "phpQuery/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobiasz Cudnik", - "email": "tobiasz.cudnik@gmail.com", - "homepage": "https://github.com/TobiaszCudnik", - "role": "Developer" - }, - { - "name": "didier Belot", - "role": "Packager" - } - ], - "description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library", - "homepage": "http://code.google.com/p/phpquery/", - "support": { - "source": "https://github.com/electrolinux/phpquery/tree/0.9.6" - }, - "install-path": "../electrolinux/phpquery" - }, { "name": "ezyang/htmlpurifier", "version": "v4.14.0", @@ -414,19 +368,69 @@ }, "install-path": "../mindplay/annotations" }, + { + "name": "obsoletepackage/phpquery", + "version": "1.0.2", + "version_normalized": "1.0.2.0", + "source": { + "type": "git", + "url": "https://github.com/ObsoletePackage/phpquery.git", + "reference": "ebe03fabd3286fdad18a0148a5f23f6dcc0443fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ObsoletePackage/phpquery/zipball/ebe03fabd3286fdad18a0148a5f23f6dcc0443fb", + "reference": "ebe03fabd3286fdad18a0148a5f23f6dcc0443fb", + "shasum": "" + }, + "time": "2022-08-21T10:51:36+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "phpQuery/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobiasz Cudnik", + "email": "tobiasz.cudnik@gmail.com", + "homepage": "https://github.com/TobiaszCudnik", + "role": "Developer" + }, + { + "name": "didier Belot", + "role": "Packager" + }, + { + "name": "obsolete package", + "homepage": "https://github.com/ObsoletePackage" + } + ], + "description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library", + "homepage": "http://code.google.com/p/phpquery/", + "support": { + "source": "https://github.com/ObsoletePackage/phpquery/tree/1.0.2" + }, + "install-path": "../obsoletepackage/phpquery" + }, { "name": "phpmailer/phpmailer", - "version": "v6.6.3", - "version_normalized": "6.6.3.0", + "version": "v6.6.4", + "version_normalized": "6.6.4.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "9400f305a898f194caff5521f64e5dfa926626f3" + "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3", - "reference": "9400f305a898f194caff5521f64e5dfa926626f3", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a94fdebaea6bd17f51be0c2373ab80d3d681269b", + "reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b", "shasum": "" }, "require": { @@ -453,7 +457,7 @@ "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" }, - "time": "2022-06-20T09:21:02+00:00", + "time": "2022-08-22T09:22:00+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -485,7 +489,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.4" }, "funding": [ { @@ -763,23 +767,23 @@ }, { "name": "thinkcmf/cmf", - "version": "v6.0.16", - "version_normalized": "6.0.16.0", + "version": "v6.0.17", + "version_normalized": "6.0.17.0", "source": { "type": "git", "url": "https://github.com/thinkcmf/cmf-core.git", - "reference": "bb02d518e7ee8c19442ddd88a45abcbc8cfb00a8" + "reference": "97681cdb9a205ab6c4fca0cfcca1b26b1c185712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thinkcmf/cmf-core/zipball/bb02d518e7ee8c19442ddd88a45abcbc8cfb00a8", - "reference": "bb02d518e7ee8c19442ddd88a45abcbc8cfb00a8", + "url": "https://api.github.com/repos/thinkcmf/cmf-core/zipball/97681cdb9a205ab6c4fca0cfcca1b26b1c185712", + "reference": "97681cdb9a205ab6c4fca0cfcca1b26b1c185712", "shasum": "" }, "require": { - "electrolinux/phpquery": "^0.9.6", "ezyang/htmlpurifier": "^4.9", "mindplay/annotations": "^1.3", + "obsoletepackage/phpquery": "^1.0.1", "phpmailer/phpmailer": "~6.0", "thinkcmf/cmf-captcha": "^3.0", "thinkcmf/cmf-extend": "~5.1.0", @@ -787,7 +791,7 @@ "topthink/think-orm": "^2.0", "xia/migration": "^6.0" }, - "time": "2022-07-22T02:27:15+00:00", + "time": "2022-08-05T14:59:02+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -823,7 +827,7 @@ "description": "The ThinkCMF Core Package", "support": { "issues": "https://github.com/thinkcmf/cmf-core/issues", - "source": "https://github.com/thinkcmf/cmf-core/tree/v6.0.16" + "source": "https://github.com/thinkcmf/cmf-core/tree/v6.0.17" }, "install-path": "../thinkcmf/cmf" }, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index f259b79a64367ca8e2ae73eaa987650108cdda81..92bab3216a16a0d3d9fab588494c63e056f5bc2d 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -11,21 +11,12 @@ ), 'versions' => array( 'chamilo/pclzip' => array( - 'pretty_version' => 'v2.8.4', - 'version' => '2.8.4.0', + 'pretty_version' => 'v2.8.5', + 'version' => '2.8.5.0', 'type' => 'library', 'install_path' => __DIR__ . '/../chamilo/pclzip', 'aliases' => array(), - 'reference' => 'b94b7a190e186a31bd37f21be3a83a48c7d6b49a', - 'dev_requirement' => false, - ), - 'electrolinux/phpquery' => array( - 'pretty_version' => '0.9.6', - 'version' => '0.9.6.0', - 'type' => 'library', - 'install_path' => __DIR__ . '/../electrolinux/phpquery', - 'aliases' => array(), - 'reference' => '6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a', + 'reference' => 'af10d07a39922b0789bf761524a22ecefc01d405', 'dev_requirement' => false, ), 'ezyang/htmlpurifier' => array( @@ -73,6 +64,15 @@ 'reference' => 'd314832b338b88299c4108361c858b0590798d2c', 'dev_requirement' => false, ), + 'obsoletepackage/phpquery' => array( + 'pretty_version' => '1.0.2', + 'version' => '1.0.2.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../obsoletepackage/phpquery', + 'aliases' => array(), + 'reference' => 'ebe03fabd3286fdad18a0148a5f23f6dcc0443fb', + 'dev_requirement' => false, + ), 'pclzip/pclzip' => array( 'dev_requirement' => false, 'replaced' => array( @@ -80,12 +80,12 @@ ), ), 'phpmailer/phpmailer' => array( - 'pretty_version' => 'v6.6.3', - 'version' => '6.6.3.0', + 'pretty_version' => 'v6.6.4', + 'version' => '6.6.4.0', 'type' => 'library', 'install_path' => __DIR__ . '/../phpmailer/phpmailer', 'aliases' => array(), - 'reference' => '9400f305a898f194caff5521f64e5dfa926626f3', + 'reference' => 'a94fdebaea6bd17f51be0c2373ab80d3d681269b', 'dev_requirement' => false, ), 'psr/cache' => array( @@ -134,12 +134,12 @@ 'dev_requirement' => false, ), 'thinkcmf/cmf' => array( - 'pretty_version' => 'v6.0.16', - 'version' => '6.0.16.0', + 'pretty_version' => 'v6.0.17', + 'version' => '6.0.17.0', 'type' => 'library', 'install_path' => __DIR__ . '/../thinkcmf/cmf', 'aliases' => array(), - 'reference' => 'bb02d518e7ee8c19442ddd88a45abcbc8cfb00a8', + 'reference' => '97681cdb9a205ab6c4fca0cfcca1b26b1c185712', 'dev_requirement' => false, ), 'thinkcmf/cmf-api' => array( diff --git a/vendor/electrolinux/phpquery/README.md b/vendor/obsoletepackage/phpquery/README.md similarity index 90% rename from vendor/electrolinux/phpquery/README.md rename to vendor/obsoletepackage/phpquery/README.md index 63b68700f9d958e1be360f86e31818992c42ba3f..304616937d5e40d38fbee34eef84d35bd0df9c73 100644 --- a/vendor/electrolinux/phpquery/README.md +++ b/vendor/obsoletepackage/phpquery/README.md @@ -1,5 +1,7 @@ ## phpQuery, one more fork! +**Note:** _I haven't used this package since many years, and just recently looked at the code: this is scary, buggy and unfinished. Please don't use it on any production server!_ + My intent is to have it easily integrated in differents projects, so available on packagist. I've gathered some fix and new features here and there, as will keep looking for new stuff on github about phpQuery @@ -12,7 +14,6 @@ I've gathered some fix and new features here and there, as will keep looking for ### github repos i've looked at: * https://github.com/denis-isaev/phpquery -* https://github.com/fmorrow/pQuery--PHPQuery- (big project so far) * https://github.com/r-sal/phpquery * https://github.com/damien-list/phpquery-1 * https://github.com/nev3rm0re/phpquery @@ -20,6 +21,10 @@ I've gathered some fix and new features here and there, as will keep looking for * https://github.com/kevee/phpquery (include php-css-parser) * https://github.com/lucassouza1/phpquery +## Manual + +* [Manual](wiki/README.md) imported from http://code.google.com/p/phpquery/wiki + ## Extracts from fmorrow README.md: ### Whats phpQuery? diff --git a/vendor/electrolinux/phpquery/api-reference/classtrees_phpQuery.html b/vendor/obsoletepackage/phpquery/api-reference/classtrees_phpQuery.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/classtrees_phpQuery.html rename to vendor/obsoletepackage/phpquery/api-reference/classtrees_phpQuery.html diff --git a/vendor/electrolinux/phpquery/api-reference/elementindex.html b/vendor/obsoletepackage/phpquery/api-reference/elementindex.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/elementindex.html rename to vendor/obsoletepackage/phpquery/api-reference/elementindex.html diff --git a/vendor/electrolinux/phpquery/api-reference/elementindex_phpQuery.html b/vendor/obsoletepackage/phpquery/api-reference/elementindex_phpQuery.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/elementindex_phpQuery.html rename to vendor/obsoletepackage/phpquery/api-reference/elementindex_phpQuery.html diff --git a/vendor/electrolinux/phpquery/api-reference/errors.html b/vendor/obsoletepackage/phpquery/api-reference/errors.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/errors.html rename to vendor/obsoletepackage/phpquery/api-reference/errors.html diff --git a/vendor/electrolinux/phpquery/api-reference/index.html b/vendor/obsoletepackage/phpquery/api-reference/index.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/index.html rename to vendor/obsoletepackage/phpquery/api-reference/index.html diff --git a/vendor/electrolinux/phpquery/api-reference/li_phpQuery.html b/vendor/obsoletepackage/phpquery/api-reference/li_phpQuery.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/li_phpQuery.html rename to vendor/obsoletepackage/phpquery/api-reference/li_phpQuery.html diff --git a/vendor/electrolinux/phpquery/api-reference/media/background.png b/vendor/obsoletepackage/phpquery/api-reference/media/background.png similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/media/background.png rename to vendor/obsoletepackage/phpquery/api-reference/media/background.png diff --git a/vendor/electrolinux/phpquery/api-reference/media/empty.png b/vendor/obsoletepackage/phpquery/api-reference/media/empty.png similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/media/empty.png rename to vendor/obsoletepackage/phpquery/api-reference/media/empty.png diff --git a/vendor/electrolinux/phpquery/api-reference/media/style.css b/vendor/obsoletepackage/phpquery/api-reference/media/style.css similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/media/style.css rename to vendor/obsoletepackage/phpquery/api-reference/media/style.css diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/Callback.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/Callback.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/Callback.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/Callback.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/CallbackParam.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/CallbackParam.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/CallbackParam.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/CallbackParam.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/CallbackReference.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/CallbackReference.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/CallbackReference.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/CallbackReference.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/DOMDocumentWrapper.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/DOMDocumentWrapper.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/DOMDocumentWrapper.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/DOMDocumentWrapper.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/DOMEvent.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/DOMEvent.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/DOMEvent.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/DOMEvent.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/_Callback.php.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/_Callback.php.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/_Callback.php.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/_Callback.php.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/_DOMDocumentWrapper.php.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/_DOMDocumentWrapper.php.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/_DOMDocumentWrapper.php.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/_DOMDocumentWrapper.php.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/_DOMEvent.php.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/_DOMEvent.php.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/_DOMEvent.php.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/_DOMEvent.php.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/_phpQuery.php.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/_phpQuery.php.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/_phpQuery.php.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/_phpQuery.php.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/_phpQueryEvents.php.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/_phpQueryEvents.php.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/_phpQueryEvents.php.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/_phpQueryEvents.php.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/_phpQueryObject.php.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/_phpQueryObject.php.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/_phpQueryObject.php.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/_phpQueryObject.php.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/phpQuery.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQuery.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/phpQuery.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQuery.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/phpQueryEvents.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQueryEvents.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/phpQueryEvents.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQueryEvents.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/phpQueryObject.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQueryObject.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/phpQueryObject.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQueryObject.html diff --git a/vendor/electrolinux/phpquery/api-reference/phpQuery/phpQueryPlugins.html b/vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQueryPlugins.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/phpQuery/phpQueryPlugins.html rename to vendor/obsoletepackage/phpquery/api-reference/phpQuery/phpQueryPlugins.html diff --git a/vendor/electrolinux/phpquery/api-reference/todolist.html b/vendor/obsoletepackage/phpquery/api-reference/todolist.html similarity index 100% rename from vendor/electrolinux/phpquery/api-reference/todolist.html rename to vendor/obsoletepackage/phpquery/api-reference/todolist.html diff --git a/vendor/electrolinux/phpquery/cli/phpquery b/vendor/obsoletepackage/phpquery/cli/phpquery similarity index 100% rename from vendor/electrolinux/phpquery/cli/phpquery rename to vendor/obsoletepackage/phpquery/cli/phpquery diff --git a/vendor/electrolinux/phpquery/composer.json b/vendor/obsoletepackage/phpquery/composer.json similarity index 77% rename from vendor/electrolinux/phpquery/composer.json rename to vendor/obsoletepackage/phpquery/composer.json index 2ea5d6663b1f01d4092cc923a98ed9ddc04517fd..2522be4368948a6ce252c86fe3a5ab8b89341353 100644 --- a/vendor/electrolinux/phpquery/composer.json +++ b/vendor/obsoletepackage/phpquery/composer.json @@ -1,8 +1,8 @@ { - "name": "electrolinux/phpquery" + "name": "obsoletepackage/phpquery" ,"type": "library" ,"description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library" - ,"version": "0.9.6" + ,"version": "1.0.2" ,"keywords": [] ,"homepage": "http://code.google.com/p/phpquery/" ,"license": "MIT" @@ -17,6 +17,10 @@ "name": "didier Belot" ,"role": "Packager" } + ,{ + "name": "obsolete package" + ,"homepage": "https://github.com/ObsoletePackage" + } ], "autoload": { "classmap": ["phpQuery/"] diff --git a/vendor/electrolinux/phpquery/demo.php b/vendor/obsoletepackage/phpquery/demo.php similarity index 100% rename from vendor/electrolinux/phpquery/demo.php rename to vendor/obsoletepackage/phpquery/demo.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery.php similarity index 99% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery.php index 08f22fc1b86e66449cec57d9957e9d26aa93eb05..a6c008f680b4991c817a1d9fcbbdfbb576def150 100644 --- a/vendor/electrolinux/phpquery/phpQuery/phpQuery.php +++ b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery.php @@ -647,7 +647,7 @@ abstract class phpQuery { * @todo still used ? */ public static function isMarkup($input) { - return ! is_array($input) && substr(trim($input), 0, 1) == '<'; + return ! is_array($input) && substr(trim((string)$input), 0, 1) == '<'; } public static function debug($text) { if (self::$debug) diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/Callback.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/Callback.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/Callback.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php similarity index 98% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php index a58b1f31648bcd11f2e58ccb341415a6842538a6..4d5eade9f33fdc2e1a4d85b831d7d3e730f746a6 100644 --- a/vendor/electrolinux/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php +++ b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/DOMDocumentWrapper.php @@ -131,7 +131,7 @@ class DOMDocumentWrapper { $this->document->formatOutput = true; $this->document->preserveWhiteSpace = true; } - protected function loadMarkupHTML($markup, $requestedCharset = null) { + protected function loadMarkupHTML($markup,$requestedCharset = '') { if (phpQuery::$debug) phpQuery::debug('Full markup load (HTML): '.substr($markup, 0, 250)); $this->loadMarkupReset(); @@ -157,7 +157,7 @@ class DOMDocumentWrapper { } // Should be careful here, still need 'magic encoding detection' since lots of pages have other 'default encoding' // Worse, some pages can have mixed encodings... we'll try not to worry about that - $requestedCharset = strtoupper($requestedCharset); + $requestedCharset = strtoupper((string)$requestedCharset); $documentCharset = strtoupper($documentCharset); phpQuery::debug("DOC: $documentCharset REQ: $requestedCharset"); if ($requestedCharset && $documentCharset && $requestedCharset !== $documentCharset) { @@ -314,8 +314,6 @@ class DOMDocumentWrapper { } protected function contentTypeToArray($contentType) { - $test = null; - $test = $matches = explode(';', trim(strtolower($contentType))); if (isset($matches[1])) { $matches[1] = explode('=', $matches[1]); @@ -324,7 +322,7 @@ class DOMDocumentWrapper { ? $matches[1][1] : $matches[1][0]; } else - $matches[1] = null; + $matches[1] = ''; return $matches; } /** @@ -351,7 +349,7 @@ class DOMDocumentWrapper { return $contentType[1]; } protected function charsetFromXML($markup) { - $matches; + $matches = array(); // find declaration preg_match('@<'.'?xml[^>]+encoding\\s*=\\s*(["|\'])(.*?)\\1@i', $markup, $matches @@ -512,7 +510,7 @@ class DOMDocumentWrapper { * @param $markup * @return $document */ - private function documentFragmentLoadMarkup($fragment, $charset, $markup = null) { + private function documentFragmentLoadMarkup($fragment, $charset, $markup = '') { // TODO error handling // TODO copy doctype // tempolary turn off @@ -532,7 +530,7 @@ class DOMDocumentWrapper { } else { $markup2 = phpQuery::$defaultDoctype.''; - $noBody = strpos($markup, '|\\+|~)\s*@', '\\1', $query) + preg_replace('@\s*(>|\\+|~)\s*@', '\\1', (string)$query) ) ); $queries = array(array()); @@ -502,7 +502,7 @@ class phpQueryObject * @todo maybe other name... */ public function getString($index = null, $callback1 = null, $callback2 = null, $callback3 = null) { - if ($index) + if (!is_null($index) && is_int($index)) $return = $this->eq($index)->text(); else { $return = array(); @@ -529,7 +529,7 @@ class phpQueryObject * @todo maybe other name... */ public function getStrings($index = null, $callback1 = null, $callback2 = null, $callback3 = null) { - if ($index) + if (!is_null($index) && is_int($index)) $return = $this->eq($index)->text(); else { $return = array(); @@ -587,7 +587,7 @@ class phpQueryObject if ( mb_strpos($class, '.', 1)) { $classes = explode('.', substr($class, 1)); $classesCount = count( $classes ); - $nodeClasses = explode(' ', $node->getAttribute('class') ); + $nodeClasses = preg_split("/[\s\t\r\n]+/", $node->getAttribute('class'),-1, PREG_SPLIT_NO_EMPTY); $nodeClassesCount = count( $nodeClasses ); if ( $classesCount > $nodeClassesCount ) return false; @@ -605,7 +605,7 @@ class phpQueryObject // strip leading dot from class name substr($class, 1), // get classes for element as array - explode(' ', $node->getAttribute('class') ) + preg_split("/[\s\t\r\n]+/", $node->getAttribute('class'),-1, PREG_SPLIT_NO_EMPTY) ); } } @@ -967,16 +967,18 @@ class phpQueryObject break; case 'parent': $this->elements = $this->map( - create_function('$node', ' + function ($node) { return $node instanceof DOMELEMENT && $node->childNodes->length - ? $node : null;') + ? $node : null; + } )->elements; break; case 'empty': $this->elements = $this->map( - create_function('$node', ' + function ($node) { return $node instanceof DOMELEMENT && $node->childNodes->length - ? null : $node;') + ? null : $node; + } )->elements; break; case 'disabled': @@ -989,19 +991,21 @@ class phpQueryObject break; case 'enabled': $this->elements = $this->map( - create_function('$node', ' - return pq($node)->not(":disabled") ? $node : null;') + function ($node) { + return pq($node)->not(":disabled") ? $node : null; + } )->elements; break; case 'header': $this->elements = $this->map( - create_function('$node', - '$isHeader = isset($node->tagName) && in_array($node->tagName, array( + function ($node) { + $isHeader = isset($node->tagName) && in_array($node->tagName, array( "h1", "h2", "h3", "h4", "h5", "h6", "h7" )); return $isHeader ? $node - : null;') + : null; + } )->elements; // $this->elements = $this->map( // create_function('$node', '$node = pq($node); @@ -1018,18 +1022,19 @@ class phpQueryObject break; case 'only-child': $this->elements = $this->map( - create_function('$node', - 'return pq($node)->siblings()->size() == 0 ? $node : null;') + function ($node) { + return pq($node)->siblings()->size() == 0 ? $node : null; + } )->elements; break; case 'first-child': $this->elements = $this->map( - create_function('$node', 'return pq($node)->prevAll()->size() == 0 ? $node : null;') + function ($node) { return pq($node)->prevAll()->size() == 0 ? $node : null; } )->elements; break; case 'last-child': $this->elements = $this->map( - create_function('$node', 'return pq($node)->nextAll()->size() == 0 ? $node : null;') + function ($node) { return pq($node)->nextAll()->size() == 0 ? $node : null; } )->elements; break; case 'nth-child': @@ -1037,33 +1042,36 @@ class phpQueryObject if (! $param) break; // nth-child(n+b) to nth-child(1n+b) - if ($param[0] == 'n') + if (substr($param, 0, 1) == 'n') $param = '1'.$param; // :nth-child(index/even/odd/equation) if ($param == 'even' || $param == 'odd') $mapped = $this->map( - create_function('$node, $param', - '$index = pq($node)->prevAll()->size()+1; + function ($node, $param) { + $index = pq($node)->prevAll()->size()+1; if ($param == "even" && ($index%2) == 0) return $node; else if ($param == "odd" && $index%2 == 1) return $node; else - return null;'), + return null; + }, new CallbackParam(), $param ); - else if (mb_strlen($param) > 1 && $param[1] == 'n') + else if (mb_strlen($param) > 1 && preg_match('/^(\d*)n([-+]?)(\d*)/', $param) === 1) // an+b $mapped = $this->map( - create_function('$node, $param', - '$prevs = pq($node)->prevAll()->size(); + function ($node, $param) { + $prevs = pq($node)->prevAll()->size(); $index = 1+$prevs; - $b = mb_strlen($param) > 3 - ? $param{3} - : 0; - $a = $param{0}; - if ($b && $param{2} == "-") - $b = -$b; + + preg_match("/^(\d*)n([-+]?)(\d*)/", $param, $matches); + $a = intval($matches[1]); + $b = intval($matches[3]); + if( $matches[2] === "-" ) { + $b = -$b; + } + if ($a > 0) { return ($index-$b)%$a == 0 ? $node @@ -1089,20 +1097,21 @@ class phpQueryObject // return ($index-$b)%$a == 0 // ? $node // : null; - '), + }, new CallbackParam(), $param ); else // index $mapped = $this->map( - create_function('$node, $index', - '$prevs = pq($node)->prevAll()->size(); + function ($node, $index) { + $prevs = pq($node)->prevAll()->size(); if ($prevs && $prevs == $index-1) return $node; else if (! $prevs && $index == 1) return $node; else - return null;'), + return null; + }, new CallbackParam(), $param ); $this->elements = $mapped->elements; @@ -1654,6 +1663,8 @@ class phpQueryObject * * @return phpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery */ + + #[\ReturnTypeWillChange] public function size() { return count($this->elements); } @@ -1663,9 +1674,12 @@ class phpQueryObject * @return phpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery * @deprecated Use length as attribute */ + #[\ReturnTypeWillChange] public function length() { return $this->size(); } + + #[\ReturnTypeWillChange] public function count() { return $this->size(); } @@ -1675,6 +1689,8 @@ class phpQueryObject * @return phpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery * @todo $level */ + + #[\ReturnTypeWillChange] public function end($level = 1) { // $this->elements = array_pop( $this->history ); // return $this; @@ -1878,7 +1894,7 @@ class phpQueryObject } /** * Enter description here... - * + * * @param $code * @return unknown_type */ @@ -1889,7 +1905,7 @@ class phpQueryObject } /** * Enter description here... - * + * * @param $code * @return unknown_type */ @@ -2264,7 +2280,7 @@ class phpQueryObject } return $return; } - + /** * @return The text content of each matching element, like * text() but returns an array with one entry per matched element. @@ -2277,7 +2293,7 @@ class phpQueryObject } return $results; } - + /** * Enter description here... * @@ -2645,7 +2661,7 @@ class phpQueryObject return is_null($value) ? '' : $this; } - + /** * @return The same attribute of each matching element, like * attr() but returns an array with one entry per matched element. @@ -2949,7 +2965,7 @@ class phpQueryObject } /** * Enter description here... - * + * * @param $key * @param $value */ @@ -2966,7 +2982,7 @@ class phpQueryObject } /** * Enter description here... - * + * * @param $key */ public function removeData($key) { @@ -2980,6 +2996,7 @@ class phpQueryObject /** * @access private */ + #[\ReturnTypeWillChange] public function rewind(){ $this->debug('iterating foreach'); // phpQuery::selectDocument($this->getDocumentID()); @@ -2995,12 +3012,14 @@ class phpQueryObject /** * @access private */ + #[\ReturnTypeWillChange] public function current(){ return $this->elementsInterator[ $this->current ]; } /** * @access private */ + #[\ReturnTypeWillChange] public function key(){ return $this->current; } @@ -3015,6 +3034,7 @@ class phpQueryObject * @see phpQueryObject::_next() * @return phpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery */ + #[\ReturnTypeWillChange] public function next($cssSelector = null){ // if ($cssSelector || $this->valid) // return $this->_next($cssSelector); @@ -3032,6 +3052,7 @@ class phpQueryObject /** * @access private */ + #[\ReturnTypeWillChange] public function valid(){ return $this->valid; } @@ -3040,18 +3061,21 @@ class phpQueryObject /** * @access private */ + #[\ReturnTypeWillChange] public function offsetExists($offset) { return $this->find($offset)->size() > 0; } /** * @access private */ + #[\ReturnTypeWillChange] public function offsetGet($offset) { return $this->find($offset); } /** * @access private */ + #[\ReturnTypeWillChange] public function offsetSet($offset, $value) { // $this->find($offset)->replaceWith($value); $this->find($offset)->html($value); @@ -3059,6 +3083,7 @@ class phpQueryObject /** * @access private */ + #[\ReturnTypeWillChange] public function offsetUnset($offset) { // empty throw new Exception("Can't do unset, use array interface only for calling queries and replacing HTML."); @@ -3099,7 +3124,7 @@ class phpQueryObject : "{$node->tagName}[{$i}]"; $node = $node->parentNode; } - $xpath = join('/', array_reverse($xpath)); + $xpath = implode('/', array_reverse($xpath)); $return[] = '/'.$xpath; } return $oneNode @@ -3121,7 +3146,7 @@ class phpQueryObject .($node->getAttribute('id') ? '#'.$node->getAttribute('id'):'') .($node->getAttribute('class') - ? '.'.join('.', split(' ', $node->getAttribute('class'))):'') + ? '.'.implode('.', explode(' ', $node->getAttribute('class'))):'') .($node->getAttribute('name') ? '[name="'.$node->getAttribute('name').'"]':'') .($node->getAttribute('value') && strpos($node->getAttribute('value'), '<'.'?php') === false diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/__config.example.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/__config.example.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/__config.example.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/__config.example.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/example.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/example.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/example.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/example.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/fix_webroot.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/fix_webroot.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/fix_webroot.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/fix_webroot.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/google_login.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/google_login.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/google_login.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/google_login.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/print_source.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/print_source.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/print_source.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/print_source.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/print_websafe.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/print_websafe.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/Scripts/print_websafe.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/Scripts/print_websafe.php diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php similarity index 99% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php index e5e83d0e10d7439200de061aac77e4cf9d4e8122..7cc886e3529743cbee1882b965a8b4b00a076046 100644 --- a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php +++ b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/WebBrowser.php @@ -84,8 +84,8 @@ class phpQueryObjectPlugin_WebBrowser { } return $return; } - - + + public static function download($self, $url = null) { $xhr = isset($self->document->xhr) ? $self->document->xhr @@ -266,7 +266,7 @@ class phpQueryPlugin_WebBrowser { } else return $pq; } - + /** * @param Zend_Http_Client $xhr */ @@ -278,7 +278,7 @@ class phpQueryPlugin_WebBrowser { return $body; } /** - * + * * @param $e * @param $callback * @return unknown_type @@ -385,7 +385,7 @@ function resolve_url($base, $url) { // Step 3 if (preg_match('!^[a-z]+:!i', $url)) return $url; $base = parse_url($base); - if ($url{0} == "#") { + if (substr($url, 0, 1) == "#") { // Step 2 (fragment) $base['fragment'] = substr($url, 1); return unparse_url($base); @@ -398,7 +398,7 @@ function resolve_url($base, $url) { 'scheme'=>$base['scheme'], 'path'=>substr($url,2), )); - } else if ($url{0} == "/") { + } else if (substr($url, 0, 1) == "/") { // Step 5 $base['path'] = $url; } else { diff --git a/vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/example.php b/vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/example.php similarity index 100% rename from vendor/electrolinux/phpquery/phpQuery/phpQuery/plugins/example.php rename to vendor/obsoletepackage/phpquery/phpQuery/phpQuery/plugins/example.php diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-fragment-utf8.html b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-fragment-utf8.html similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-fragment-utf8.html rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-fragment-utf8.html diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-fragment-utf8.xhtml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-fragment-utf8.xhtml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-fragment-utf8.xhtml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-fragment-utf8.xhtml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-fragment-utf8.xml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-fragment-utf8.xml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-fragment-utf8.xml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-fragment-utf8.xml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592-nocharset.html b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592-nocharset.html similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592-nocharset.html rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592-nocharset.html diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592-nocharset.xhtml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592-nocharset.xhtml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592-nocharset.xhtml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592-nocharset.xhtml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592-nocharset.xml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592-nocharset.xml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592-nocharset.xml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592-nocharset.xml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592.html b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592.html similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592.html rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592.html diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592.xhtml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592.xhtml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592.xhtml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592.xhtml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592.xml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592.xml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-iso88592.xml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-iso88592.xml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8-nocharset.html b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8-nocharset.html similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-utf8-nocharset.html rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8-nocharset.html diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8-nocharset.xhtml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8-nocharset.xhtml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-utf8-nocharset.xhtml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8-nocharset.xhtml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8-nocharset.xml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8-nocharset.xml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-utf8-nocharset.xml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8-nocharset.xml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.html b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.html similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.html rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.html diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.php b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.php similarity index 85% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.php rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.php index 35353c74c75cceb3476b16c0eec3a89deb4647f1..b6e2893c9fdef83205ee2285eb7990919567baec 100644 --- a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.php +++ b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.php @@ -8,6 +8,6 @@ Hello World! ąśżźć - '>Attr test + '>Attr test diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.xhtml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.xhtml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.xhtml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.xhtml diff --git a/vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.xml b/vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.xml similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document-types/document-utf8.xml rename to vendor/obsoletepackage/phpquery/test-cases/document-types/document-utf8.xml diff --git a/vendor/electrolinux/phpquery/test-cases/document_types.php b/vendor/obsoletepackage/phpquery/test-cases/document_types.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/document_types.php rename to vendor/obsoletepackage/phpquery/test-cases/document_types.php diff --git a/vendor/electrolinux/phpquery/test-cases/run.php b/vendor/obsoletepackage/phpquery/test-cases/run.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/run.php rename to vendor/obsoletepackage/phpquery/test-cases/run.php diff --git a/vendor/electrolinux/phpquery/test-cases/test.html b/vendor/obsoletepackage/phpquery/test-cases/test.html similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test.html rename to vendor/obsoletepackage/phpquery/test-cases/test.html diff --git a/vendor/electrolinux/phpquery/test-cases/test_2.php b/vendor/obsoletepackage/phpquery/test-cases/test_2.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_2.php rename to vendor/obsoletepackage/phpquery/test-cases/test_2.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_4.php b/vendor/obsoletepackage/phpquery/test-cases/test_4.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_4.php rename to vendor/obsoletepackage/phpquery/test-cases/test_4.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_5.php b/vendor/obsoletepackage/phpquery/test-cases/test_5.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_5.php rename to vendor/obsoletepackage/phpquery/test-cases/test_5.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_ajax.php b/vendor/obsoletepackage/phpquery/test-cases/test_ajax.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_ajax.php rename to vendor/obsoletepackage/phpquery/test-cases/test_ajax.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_ajax_data_1 b/vendor/obsoletepackage/phpquery/test-cases/test_ajax_data_1 similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_ajax_data_1 rename to vendor/obsoletepackage/phpquery/test-cases/test_ajax_data_1 diff --git a/vendor/electrolinux/phpquery/test-cases/test_arrayaccess.php b/vendor/obsoletepackage/phpquery/test-cases/test_arrayaccess.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_arrayaccess.php rename to vendor/obsoletepackage/phpquery/test-cases/test_arrayaccess.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_attr.php b/vendor/obsoletepackage/phpquery/test-cases/test_attr.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_attr.php rename to vendor/obsoletepackage/phpquery/test-cases/test_attr.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_callback.php b/vendor/obsoletepackage/phpquery/test-cases/test_callback.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_callback.php rename to vendor/obsoletepackage/phpquery/test-cases/test_callback.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_charset.php b/vendor/obsoletepackage/phpquery/test-cases/test_charset.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_charset.php rename to vendor/obsoletepackage/phpquery/test-cases/test_charset.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_document.php b/vendor/obsoletepackage/phpquery/test-cases/test_document.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_document.php rename to vendor/obsoletepackage/phpquery/test-cases/test_document.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_events.php b/vendor/obsoletepackage/phpquery/test-cases/test_events.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_events.php rename to vendor/obsoletepackage/phpquery/test-cases/test_events.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_insert.php b/vendor/obsoletepackage/phpquery/test-cases/test_insert.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_insert.php rename to vendor/obsoletepackage/phpquery/test-cases/test_insert.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_manipulation.php b/vendor/obsoletepackage/phpquery/test-cases/test_manipulation.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_manipulation.php rename to vendor/obsoletepackage/phpquery/test-cases/test_manipulation.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_manual.php b/vendor/obsoletepackage/phpquery/test-cases/test_manual.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_manual.php rename to vendor/obsoletepackage/phpquery/test-cases/test_manual.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_multidoc.php b/vendor/obsoletepackage/phpquery/test-cases/test_multidoc.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_multidoc.php rename to vendor/obsoletepackage/phpquery/test-cases/test_multidoc.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_php.php b/vendor/obsoletepackage/phpquery/test-cases/test_php.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_php.php rename to vendor/obsoletepackage/phpquery/test-cases/test_php.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_replace.php b/vendor/obsoletepackage/phpquery/test-cases/test_replace.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_replace.php rename to vendor/obsoletepackage/phpquery/test-cases/test_replace.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_scripts.php b/vendor/obsoletepackage/phpquery/test-cases/test_scripts.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_scripts.php rename to vendor/obsoletepackage/phpquery/test-cases/test_scripts.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_selectors.php b/vendor/obsoletepackage/phpquery/test-cases/test_selectors.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_selectors.php rename to vendor/obsoletepackage/phpquery/test-cases/test_selectors.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_webbrowser.php b/vendor/obsoletepackage/phpquery/test-cases/test_webbrowser.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_webbrowser.php rename to vendor/obsoletepackage/phpquery/test-cases/test_webbrowser.php diff --git a/vendor/electrolinux/phpquery/test-cases/test_wrap.php b/vendor/obsoletepackage/phpquery/test-cases/test_wrap.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/test_wrap.php rename to vendor/obsoletepackage/phpquery/test-cases/test_wrap.php diff --git a/vendor/electrolinux/phpquery/test-cases/xpath.php b/vendor/obsoletepackage/phpquery/test-cases/xpath.php similarity index 100% rename from vendor/electrolinux/phpquery/test-cases/xpath.php rename to vendor/obsoletepackage/phpquery/test-cases/xpath.php diff --git a/vendor/electrolinux/phpquery/unit-tests/test.html b/vendor/obsoletepackage/phpquery/unit-tests/test.html similarity index 100% rename from vendor/electrolinux/phpquery/unit-tests/test.html rename to vendor/obsoletepackage/phpquery/unit-tests/test.html diff --git a/vendor/electrolinux/phpquery/unit-tests/test.php b/vendor/obsoletepackage/phpquery/unit-tests/test.php similarity index 100% rename from vendor/electrolinux/phpquery/unit-tests/test.php rename to vendor/obsoletepackage/phpquery/unit-tests/test.php diff --git a/vendor/phpmailer/phpmailer/README.md b/vendor/phpmailer/phpmailer/README.md index 3a1a05b2692d0a390809fbe308f45b2b3ea7000b..56f971a499845b1458dbed758063af22484caa32 100644 --- a/vendor/phpmailer/phpmailer/README.md +++ b/vendor/phpmailer/phpmailer/README.md @@ -10,6 +10,7 @@ [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer) [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](https://phpmailer.github.io/PHPMailer/) +[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer/badge)](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer) ## Features - Probably the world's most popular code for sending email from PHP! diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION index a45cc0adf06ec4e78e9821da1d2cfb6f3b794782..a08b5f1e88fb86a8382110ed5ee830b96688b22f 100644 --- a/vendor/phpmailer/phpmailer/VERSION +++ b/vendor/phpmailer/phpmailer/VERSION @@ -1 +1 @@ -6.6.3 \ No newline at end of file +6.6.4 \ No newline at end of file diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php index b3d5ca94bd7c6c1bfcbb197775c4d682b57b0a80..339ee5753b7fc4080508e8acd300a7e6b797b784 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php @@ -5,22 +5,29 @@ * @package PHPMailer */ -$PHPMAILER_LANG['authenticate'] = 'SMTP Σφάλμα: Αδυναμία πιστοποίησης (authentication).'; -$PHPMAILER_LANG['connect_host'] = 'SMTP Σφάλμα: Αδυναμία σύνδεσης στον SMTP-Host.'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Σφάλμα: Τα δεδομένα δεν έγιναν αποδεκτά.'; -$PHPMAILER_LANG['empty_message'] = 'Το E-Mail δεν έχει περιεχόμενο .'; -$PHPMAILER_LANG['encoding'] = 'Αγνωστο Encoding-Format: '; -$PHPMAILER_LANG['execute'] = 'Αδυναμία εκτέλεσης ακόλουθης εντολής: '; -$PHPMAILER_LANG['file_access'] = 'Αδυναμία προσπέλασης του αρχείου: '; -$PHPMAILER_LANG['file_open'] = 'Σφάλμα Αρχείου: Δεν είναι δυνατό το άνοιγμα του ακόλουθου αρχείου: '; -$PHPMAILER_LANG['from_failed'] = 'Η παρακάτω διεύθυνση αποστολέα δεν είναι σωστή: '; -$PHPMAILER_LANG['instantiate'] = 'Αδυναμία εκκίνησης Mail function.'; -$PHPMAILER_LANG['invalid_address'] = 'Το μήνυμα δεν εστάλη, η διεύθυνση δεν είναι έγκυρη: '; +$PHPMAILER_LANG['authenticate'] = 'Σφάλμα SMTP: Αδυναμία πιστοποίησης.'; +$PHPMAILER_LANG['buggy_php'] = 'Η έκδοση PHP που χρησιμοποιείτε παρουσιάζει σφάλμα που μπορεί να έχει ως αποτέλεσμα κατεστραμένα μηνύματα. Για να το διορθώσετε, αλλάξτε τον τρόπο αποστολής σε SMTP, απενεργοποιήστε την επιλογή mail.add_x_header στο αρχείο php.ini, αλλάξτε λειτουργικό σε MacOS ή Linux ή αναβαθμίστε την PHP σε έκδοση 7.0.17+ ή 7.1.3+.'; +$PHPMAILER_LANG['connect_host'] = 'Σφάλμα SMTP: Αδυναμία σύνδεσης με τον φιλοξενητή SMTP.'; +$PHPMAILER_LANG['data_not_accepted'] = 'Σφάλμα SMTP: Μη αποδεκτά δεδομένα.'; +$PHPMAILER_LANG['empty_message'] = 'Η ηλεκτρονική επιστολή δεν έχει περιεχόμενο.'; +$PHPMAILER_LANG['encoding'] = 'Άγνωστη μορφή κωδικοποίησης: '; +$PHPMAILER_LANG['execute'] = 'Αδυναμία εκτέλεσης: '; +$PHPMAILER_LANG['extension_missing'] = 'Απουσία επέκτασης: '; +$PHPMAILER_LANG['file_access'] = 'Αδυναμία πρόσβασης στο αρχείο: '; +$PHPMAILER_LANG['file_open'] = 'Σφάλμα Αρχείου: Αδυναμία ανοίγματος αρχείου: '; +$PHPMAILER_LANG['from_failed'] = 'Η ακόλουθη διεύθυνση αποστολέα δεν είναι σωστή: '; +$PHPMAILER_LANG['instantiate'] = 'Αδυναμία εκκίνησης συνάρτησης Mail.'; +$PHPMAILER_LANG['invalid_address'] = 'Μη έγκυρη διεύθυνση: '; +$PHPMAILER_LANG['invalid_header'] = 'Μη έγκυρο όνομα κεφαλίδας ή τιμή'; +$PHPMAILER_LANG['invalid_hostentry'] = 'Μη έγκυρη εισαγωγή φιλοξενητή: '; +$PHPMAILER_LANG['invalid_host'] = 'Μη έγκυρος φιλοξενητής: '; $PHPMAILER_LANG['mailer_not_supported'] = ' mailer δεν υποστηρίζεται.'; -$PHPMAILER_LANG['provide_address'] = 'Παρακαλούμε δώστε τουλάχιστον μια e-mail διεύθυνση παραλήπτη.'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP Σφάλμα: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: '; +$PHPMAILER_LANG['provide_address'] = 'Δώστε τουλάχιστον μια ηλεκτρονική διεύθυνση παραλήπτη.'; +$PHPMAILER_LANG['recipients_failed'] = 'Σφάλμα SMTP: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: '; $PHPMAILER_LANG['signing'] = 'Σφάλμα υπογραφής: '; -$PHPMAILER_LANG['smtp_connect_failed'] = 'Αποτυχία σύνδεσης στον SMTP Server.'; -$PHPMAILER_LANG['smtp_error'] = 'Σφάλμα από τον SMTP Server: '; -$PHPMAILER_LANG['variable_set'] = 'Αδυναμία ορισμού ή αρχικοποίησης μεταβλητής: '; -//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: '; +$PHPMAILER_LANG['smtp_code'] = 'Κώδικάς SMTP: '; +$PHPMAILER_LANG['smtp_code_ex'] = 'Πρόσθετες πληροφορίες SMTP: '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'Αποτυχία σύνδεσης SMTP.'; +$PHPMAILER_LANG['smtp_detail'] = 'Λεπτομέρεια: '; +$PHPMAILER_LANG['smtp_error'] = 'Σφάλμα με τον διακομιστή SMTP: '; +$PHPMAILER_LANG['variable_set'] = 'Αδυναμία ορισμού ή επαναφοράς μεταβλητής: '; diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php index 6590a0ef36c5c37f1a0fd943193af769f1a37eb8..62424545a2d42bf772be8fee53c4c07d98676909 100644 --- a/vendor/phpmailer/phpmailer/src/PHPMailer.php +++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php @@ -350,8 +350,8 @@ class PHPMailer public $Password = ''; /** - * SMTP auth type. - * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified. + * SMTP authentication type. Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2. + * If not specified, the first one from that list that the server supports will be selected. * * @var string */ @@ -750,7 +750,7 @@ class PHPMailer * * @var string */ - const VERSION = '6.6.3'; + const VERSION = '6.6.4'; /** * Error severity: message only, continue processing. @@ -1096,7 +1096,7 @@ class PHPMailer return false; } - if ($name !== null) { + if ($name !== null && is_string($name)) { $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim } else { $name = ''; @@ -1288,7 +1288,7 @@ class PHPMailer */ public function setFrom($address, $name = '', $auto = true) { - $address = trim($address); + $address = trim((string)$address); $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim //Don't validate now addresses with IDN. Will be done in send(). $pos = strrpos($address, '@'); @@ -1891,7 +1891,14 @@ class PHPMailer foreach ($this->to as $toaddr) { $toArr[] = $this->addrFormat($toaddr); } - $to = implode(', ', $toArr); + $to = trim(implode(', ', $toArr)); + + //If there are no To-addresses (e.g. when sending only to BCC-addresses) + //the following should be added to get a correct DKIM-signature. + //Compare with $this->preSend() + if ($to === '') { + $to = 'undisclosed-recipients:;'; + } $params = null; //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver @@ -4470,6 +4477,7 @@ class PHPMailer 'ics' => 'text/calendar', 'xml' => 'text/xml', 'xsl' => 'text/xml', + 'csv' => 'text/csv', 'wmv' => 'video/x-ms-wmv', 'mpeg' => 'video/mpeg', 'mpe' => 'video/mpeg', diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php index a7cc3911223ea0b608c8eee415e499744c8d49b7..78e91e49a7348a5038be7aaa7a1f7ad649ac6f6e 100644 --- a/vendor/phpmailer/phpmailer/src/POP3.php +++ b/vendor/phpmailer/phpmailer/src/POP3.php @@ -46,7 +46,7 @@ class POP3 * * @var string */ - const VERSION = '6.6.3'; + const VERSION = '6.6.4'; /** * Default POP3 port number. diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php index c439a888ba4840820da1aca25d82fa3573958d3d..cc1711d2e2459bd43b1af1577de1ee7826b2cd20 100644 --- a/vendor/phpmailer/phpmailer/src/SMTP.php +++ b/vendor/phpmailer/phpmailer/src/SMTP.php @@ -35,7 +35,7 @@ class SMTP * * @var string */ - const VERSION = '6.6.3'; + const VERSION = '6.6.4'; /** * SMTP line break constant. diff --git a/vendor/services.php b/vendor/services.php index fbcbf1389773be612dc24e3cd3f10c0ecf405988..f3de1be1ef690ce897b59d92115a1d6e607b60f7 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'app\\admin\\AppStoreService', diff --git a/vendor/thinkcmf/cmf-app/src/admin/controller/IndexController.php b/vendor/thinkcmf/cmf-app/src/admin/controller/IndexController.php index 80fa89ef34f5e6523cf5ade588b74ba61bbb35fa..1d1a932aa42f172e65ed077ef7c8941ea1abe2cc 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/controller/IndexController.php +++ b/vendor/thinkcmf/cmf-app/src/admin/controller/IndexController.php @@ -21,7 +21,7 @@ class IndexController extends AdminBaseController public function initialize() { $adminSettings = cmf_get_option('admin_settings'); - if (empty($adminSettings['admin_password']) || $this->request->pathinfo() == $adminSettings['admin_password'] || true) { + if (empty($adminSettings['admin_password']) || $this->request->pathinfo() == $adminSettings['admin_password']) { $adminId = cmf_get_current_admin_id(); if (empty($adminId)) { session("__LOGIN_BY_CMF_ADMIN_PW__", 1);//设置后台登录加密码 diff --git a/vendor/thinkcmf/cmf-app/src/admin/controller/SlideController.php b/vendor/thinkcmf/cmf-app/src/admin/controller/SlideController.php index d766c28b6eee20e53f23b8eed905fd3acbc09e0e..0e5d8e53537d079cf5e76c5b5b75b6d16633bfd1 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/controller/SlideController.php +++ b/vendor/thinkcmf/cmf-app/src/admin/controller/SlideController.php @@ -83,7 +83,7 @@ class SlideController extends AdminBaseController public function addPost() { if ($this->request->isPost()) { - $data = $this->request->param(); + $data = $this->request->param('',null,'strip_tags'); $slidePostModel = new SlideModel(); $result = $this->validate($data, 'Slide'); if ($result !== true) { @@ -133,7 +133,7 @@ class SlideController extends AdminBaseController public function editPost() { if ($this->request->isPost()) { - $data = $this->request->param(); + $data = $this->request->param('',null,'strip_tags'); $result = $this->validate($data, 'Slide'); if ($result !== true) { $this->error($result); diff --git a/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php b/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php index b61f295d9af41af88cbef337f83465671ef03050..677d90a57d72a0f7f87ecabfd8e3df2eabd9d685 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php +++ b/vendor/thinkcmf/cmf-app/src/admin/controller/SlideItemController.php @@ -91,7 +91,7 @@ class SlideItemController extends AdminBaseController public function addPost() { if ($this->request->isPost()) { - $data = $this->request->param(); + $data = $this->request->param('',null,'strip_tags'); SlideItemModel::insert($data['post']); $this->success(lang('ADD_SUCCESS'), url('SlideItem/index', ['slide_id' => $data['post']['slide_id']])); } @@ -142,7 +142,7 @@ class SlideItemController extends AdminBaseController public function editPost() { if ($this->request->isPost()) { - $data = $this->request->param(); + $data = $this->request->param('',null,'strip_tags'); $data['post']['image'] = cmf_asset_relative_url($data['post']['image']); diff --git a/vendor/thinkcmf/cmf-app/src/admin/controller/UserController.php b/vendor/thinkcmf/cmf-app/src/admin/controller/UserController.php index 18f8d6682b1d81817f411c206583d106b3baab91..5d7eb8c418c1337eecbcb2e5edff7aaf16261f1c 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/controller/UserController.php +++ b/vendor/thinkcmf/cmf-app/src/admin/controller/UserController.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\admin\controller; +use app\admin\logic\UserLogic; use app\admin\model\RoleModel; use app\admin\model\RoleUserModel; use app\admin\model\UserModel; @@ -131,11 +132,13 @@ class UserController extends AdminBaseController $roleIds = $this->request->param('role_id/a'); if (!empty($roleIds) && is_array($roleIds)) { $data = $this->request->param(); - $result = $this->validate($data, 'User'); + $result = $this->validate($data, 'User.add'); if ($result !== true) { $this->error($result); } else { - $data['user_pass'] = cmf_password($data['user_pass']); + $data['user_pass'] = cmf_password($data['user_pass']); + $data['create_time'] = time(); + $data['last_login_time'] = $data['create_time']; $userId = UserModel::strict(false)->insertGetId($data); if ($userId !== false) { //$role_user_model=M("RoleUser"); @@ -177,7 +180,9 @@ class UserController extends AdminBaseController if (!empty($content)) { return $content; } - + if(!UserLogic::isCreator()){ + $this->error('为了网站的安全，非网站创建者不可访问编辑页面'); + } $id = $this->request->param('id', 0, 'intval'); $roles = RoleModel::where('status', 1)->order("id DESC")->select(); $this->assign("roles", $roles); @@ -205,6 +210,9 @@ class UserController extends AdminBaseController public function editPost() { if ($this->request->isPost()) { + if(!UserLogic::isCreator()){ + $this->error('为了网站的安全，非网站创建者不可编辑'); + } $roleIds = $this->request->param('role_id/a'); if (!empty($roleIds) && is_array($roleIds)) { $data = $this->request->param(); @@ -220,7 +228,7 @@ class UserController extends AdminBaseController $this->error($result); } else { $userId = $this->request->param('id', 0, 'intval'); - $result = UserModel::strict(false)->where('id', $userId)->update($data); + $result = UserModel::strict(false)->where('id', $userId)->save($data); if ($result !== false) { RoleUserModel::where("user_id", $userId)->delete(); foreach ($roleIds as $roleId) { @@ -308,6 +316,9 @@ class UserController extends AdminBaseController { if ($this->request->isPost()) { $id = $this->request->param('id', 0, 'intval'); + if(!UserLogic::isCreator()){ + $this->error('为了网站的安全，非网站创建者不可删除'); + } if ($id == 1) { $this->error("最高管理员不能删除！"); } @@ -339,6 +350,9 @@ class UserController extends AdminBaseController if ($this->request->isPost()) { $id = $this->request->param('id', 0, 'intval'); if (!empty($id)) { + if(!UserLogic::isCreator()){ + $this->error('为了网站的安全，非网站创建者不可拉黑'); + } $result = UserModel::where(['id' => $id, 'user_type' => 1])->update(['user_status' => '0']); if ($result !== false) { $this->success('管理员停用成功！', url('User/index')); @@ -369,6 +383,9 @@ class UserController extends AdminBaseController if ($this->request->isPost()) { $id = $this->request->param('id', 0, 'intval'); if (!empty($id)) { + if(!UserLogic::isCreator()){ + $this->error('为了网站的安全，非网站创建者不可启用'); + } $result = UserModel::where(['id' => $id, 'user_type' => 1])->update(['user_status' => '1']); if ($result !== false) { $this->success('管理员启用成功！', url('User/index')); diff --git a/vendor/thinkcmf/cmf-app/src/admin/lang/en-us/admin_menu.php b/vendor/thinkcmf/cmf-app/src/admin/lang/en-us/admin_menu.php index 8242e2e01938e64d216b675a8c5ae715fa0b5601..28b38683aa47371b2f949721d1add3648a033916 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/lang/en-us/admin_menu.php +++ b/vendor/thinkcmf/cmf-app/src/admin/lang/en-us/admin_menu.php @@ -82,6 +82,9 @@ return [ 'ADMIN_SLIDECAT_ADD_POST' => '提交添加', 'ADMIN_SLIDECAT_EDIT_POST' => '提交编辑', 'ADMIN_SLIDECAT_INDEX' => '幻灯片分类', + 'ADMIN_SLIDEITEM_INDEX' => '幻灯片页面管理', + 'ADMIN_SLIDEITEM_ADD' => '幻灯片页面添加', + 'ADMIN_SLIDEITEM_EDIT' => '幻灯片页面编辑', 'ADMIN_STORAGE_INDEX' => '文件存储', 'ADMIN_STORAGE_SETTING_POST' => '文件存储设置提交', 'ADMIN_USER_ADD_POST' => '添加提交', diff --git a/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn.php b/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn.php index dcee96f15ba963442b1cf26eaa721667e78857bb..c8ba4190f39656bb546acc01b3d401f7f835d6c1 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn.php +++ b/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn.php @@ -128,7 +128,7 @@ return [ 'Sub Navigations' => '菜单管理', 'Parent' => '上级', 'Full Url' => '原始网址', - 'Short Url' => '原始网址', + 'Short Url' => '显示网址', 'SHORT_URL_HELP_BLOCK_TEXT' => 'url格式一般为list/:param1/:param2或 list-<param1>-<param2>', 'Image' => '图片', 'Installed successfully' => '安装成功！', diff --git a/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn/admin_menu.php b/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn/admin_menu.php index e6ed12aa01a7c916c89f0e1ac5f0362d05f0bbfd..d7afb08748b30889ec28e09a14d9881515adf6b4 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn/admin_menu.php +++ b/vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn/admin_menu.php @@ -78,6 +78,9 @@ return [ 'ADMIN_SLIDE_TOGGLE' => '幻灯片显示切换', 'ADMIN_SLIDECAT_ADD_POST' => '提交添加', 'ADMIN_SLIDECAT_EDIT_POST' => '提交编辑', + 'ADMIN_SLIDEITEM_INDEX' => '幻灯片页面管理', + 'ADMIN_SLIDEITEM_ADD' => '幻灯片页面添加', + 'ADMIN_SLIDEITEM_EDIT' => '幻灯片页面编辑', 'ADMIN_SLIDECAT_INDEX' => '幻灯片分类', 'ADMIN_STORAGE_INDEX' => '文件存储', 'ADMIN_STORAGE_SETTING_POST' => '文件存储设置提交', diff --git a/vendor/thinkcmf/cmf-app/src/admin/logic/UserLogic.php b/vendor/thinkcmf/cmf-app/src/admin/logic/UserLogic.php new file mode 100644 index 0000000000000000000000000000000000000000..9546a9a81102467af277a14f78864192f24e2924 --- /dev/null +++ b/vendor/thinkcmf/cmf-app/src/admin/logic/UserLogic.php @@ -0,0 +1,10 @@ + 'array' + ]; } diff --git a/vendor/thinkcmf/cmf-app/src/admin/model/UserModel.php b/vendor/thinkcmf/cmf-app/src/admin/model/UserModel.php index 9767816f77607e8872096c8ced06a78e371999d4..96f806c46952a9a95a7d1d523292d6fc8b164d54 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/model/UserModel.php +++ b/vendor/thinkcmf/cmf-app/src/admin/model/UserModel.php @@ -24,4 +24,5 @@ class UserModel extends Model 'more' => 'array', ]; + protected $autoWriteTimestamp = true; } diff --git a/vendor/thinkcmf/cmf-app/src/admin/validate/UserValidate.php b/vendor/thinkcmf/cmf-app/src/admin/validate/UserValidate.php index 77b9b7a5799d383d0ebd60c1bf3bc070b475f467..e82a369fd9c69b5fe15831d8c0f9ee100666a23b 100644 --- a/vendor/thinkcmf/cmf-app/src/admin/validate/UserValidate.php +++ b/vendor/thinkcmf/cmf-app/src/admin/validate/UserValidate.php @@ -15,7 +15,7 @@ use think\Validate; class UserValidate extends Validate { protected $rule = [ - 'user_login' => 'require|unique:user,user_login', + 'user_login' => 'require|unique:user,user_login|token', 'user_pass' => 'require', 'user_email' => 'require|email|unique:user,user_email', ]; diff --git a/vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php b/vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php index 74994e8a1d4c37eedd4eb05cb769cf2bd32e9769..194b042cefb6a772c197f73705f0559d61cbfe42 100644 --- a/vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php +++ b/vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php @@ -129,8 +129,12 @@ class AdminIndexController extends AdminBaseController { $id = $this->request->param('id', 0, 'intval'); if ($id) { - UserModel::where(["id" => $id, "user_type" => 2])->update(['user_status' => 1]); - $this->success("会员启用成功！", ''); + $result = UserModel::where(["id" => $id, "user_type" => 2])->update(['user_status' => 1]); + if ($result) { + $this->success("会员启用成功！", "adminIndex/index"); + } else { + $this->error('会员启用失败,会员不存在,或者是管理员！'); + } } else { $this->error('数据传入失败！'); } diff --git a/vendor/thinkcmf/cmf/README.md b/vendor/thinkcmf/cmf/README.md index ddc1fb3b5078b916cf99c5ebe83175ef2fb77f5a..6432939b3b0bb22029d02a67f0aa2acd007fa1ce 100644 --- a/vendor/thinkcmf/cmf/README.md +++ b/vendor/thinkcmf/cmf/README.md @@ -1,6 +1,9 @@ # ThinkCMF核心包 ## 更新日志 +### v6.0.17 +* 替换`phpquery`包 + ### v6.0.16 * 修复qrcode库php8.0及以上报错 * 优化语言包加载 diff --git a/vendor/thinkcmf/cmf/composer.json b/vendor/thinkcmf/cmf/composer.json index 5d3106a643fe33f322ef7fe2bfd6e1947f90852a..eeb1b8766eb51f3bef574ede3372dd419a39c017 100644 --- a/vendor/thinkcmf/cmf/composer.json +++ b/vendor/thinkcmf/cmf/composer.json @@ -13,7 +13,7 @@ "phpmailer/phpmailer": "~6.0", "mindplay/annotations": "^1.3", "ezyang/htmlpurifier": "^4.9", - "electrolinux/phpquery": "^0.9.6", + "obsoletepackage/phpquery": "^1.0.1", "thinkcmf/cmf-extend": "~5.1.0", "topthink/think-orm": "^2.0", "xia/migration": "^6.0", diff --git a/vendor/thinkcmf/cmf/src/common.php b/vendor/thinkcmf/cmf/src/common.php index 31c2f06ee529e1f8186cf8af8ca1fa29c35cb93b..8431a49faf9297da684b6a73d10655d7add0bb7c 100644 --- a/vendor/thinkcmf/cmf/src/common.php +++ b/vendor/thinkcmf/cmf/src/common.php @@ -2306,7 +2306,7 @@ function str_to_arr($string) */ function cmf_is_cli() { - return PHP_SAPI === 'cli' || defined('STDIN'); + return PHP_SAPI === 'cli' || defined('STDIN'); } /** @@ -2333,3 +2333,13 @@ function cmf_mobile_mask($mobile) { return substr($mobile, 0, 3) . '****' . substr($mobile, -4, 4); } + +/** + * 吾辈当自强 + * @param string $dayDayUp + * @return string + */ +function cmf_together(string $dayDayUp = '2022-08-03 01:58') +{ + return "吾辈当自强!\n$dayDayUp"; +} diff --git a/vendor/thinkcmf/cmf/src/controller/RestBaseController.php b/vendor/thinkcmf/cmf/src/controller/RestBaseController.php index 174cf3cb7f567cd67517ef204ad05b1008815f82..90f975e838d62823fa34d6448c7f26c313d53e4a 100755 --- a/vendor/thinkcmf/cmf/src/controller/RestBaseController.php +++ b/vendor/thinkcmf/cmf/src/controller/RestBaseController.php @@ -93,7 +93,7 @@ class RestBaseController private function _initUser() { - $token = $this->request->header('Authorization'); + $token = $this->request->header('Authorization',''); if (substr($token, 0, 7) === 'Bearer ') { $token = substr($token, 7); } diff --git a/vendor/thinkcmf/cmf/src/lib/Upload.php b/vendor/thinkcmf/cmf/src/lib/Upload.php index 679478544d851ac5656e07c34b7abdec94125c9d..9dcc84f673bd55f788e0d287b79183dfb0f35a5a 100644 --- a/vendor/thinkcmf/cmf/src/lib/Upload.php +++ b/vendor/thinkcmf/cmf/src/lib/Upload.php @@ -122,6 +122,9 @@ class Upload if (empty($userId)) { $token = $this->request->header('Authorization'); + if (substr($token, 0, 7) === 'Bearer ') { + $token = substr($token, 7); + } if (empty($token)) { $token = $this->request->header('XX-Token'); } diff --git a/vendor/thinkcmf/cmf/think/Template.php b/vendor/thinkcmf/cmf/think/Template.php index 0914d168398612437c5c24a930f18bff5a57d29b..6ad073424e05c2ad28579ab5cc926408d2b3a5ff 100644 --- a/vendor/thinkcmf/cmf/think/Template.php +++ b/vendor/thinkcmf/cmf/think/Template.php @@ -1412,7 +1412,7 @@ hello; $module = isset($module) ? $module : app()->http->getName(); $path = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : ''); } else { - $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . basename($this->config['view_path']) . DIRECTORY_SEPARATOR : $this->config['view_path']; + $path = isset($module) ? app()->getAppPath() . $module . DIRECTORY_SEPARATOR . basename($this->config['view_path']) . DIRECTORY_SEPARATOR : $this->config['view_path']; } $template = $path . $template . '.' . ltrim($this->config['view_suffix'], '.'); }