' .
'
' . __('Check stores versions') . '
';
- if (!method_exists('dcUtils', 'versionsCompare')
- || dcUtils::versionsCompare(DC_VERSION, self::DC_MAX, '>', false)) {
+ if (dcUtils::versionsCompare(DC_VERSION, My::DC_MAX, '>', false)) {
echo
- '
' . sprintf(__('This version does not support Dotclear > %s'), self::DC_MAX) . '
';
+ '
' . sprintf(__('This version does not support Dotclear > %s'), My::DC_MAX) . '
';
return;
}
@@ -72,12 +70,11 @@ class csvBehaviors
echo
'
';
- if (!empty($_POST['csvcheck'])) {
- $store = new csvStore($modules, dcCore::app()->blog->settings->system->store_plugin_url, true);
- self::modulesList($list, $store->get(true));
+ if ($repos !== null) {
+ self::modulesList($list, $repos);
}
echo
@@ -86,7 +83,7 @@ class csvBehaviors
private static function modulesList($modules, $repos)
{
- echo
+ echo
'
' .
'
' .
'' . html::escapeHTML(__('Modules list')) . '' .
@@ -101,7 +98,6 @@ class csvBehaviors
}
foreach ($modules as $id => $module) {
-
if (!isset($repos[$id])) {
$img = [__('No version available'), 'check-off.png'];
} elseif (isset($repos[$id]) && dcUtils::versionsCompare(DC_VERSION, $repos[$id]['dc_min'], '>=', false)) {
@@ -131,37 +127,37 @@ class csvBehaviors
echo
'
' .
- '| ' .
+ ' | ' .
$img . ' | ' .
- '' .
+ ' | ' .
dcAdminHelper::adminIcon($icon, false, html::escapeHTML($id), html::escapeHTML($id)) . ' | ' .
- '' .
+ ' | ' .
html::escapeHTML($module['name']) . ($id != $module['name'] ? sprintf(__(' (%s)'), $id) : '') .
'';
if (isset($repos[$id])) {
echo
- ' | ' .
+ ' | ' .
html::escapeHTML($repos[$id]['current_version']) . ' | ' .
- '' .
+ ' | ' .
html::escapeHTML($repos[$id]['version']) . ' | ' .
- '' .
+ ' | ' .
html::escapeHTML($repos[$id]['dc_min']) . ' | ';
if (DC_ALLOW_REPOSITORIES) {
echo
- '' .
+ ' | ' .
(empty($module['repository']) ? __('Official repository') : __('Third-party repository')) . ' | ';
}
} else {
- echo
- '' .
+ echo
+ ' | ' .
html::escapeHTML($module['version']) . ' | ' .
- '' .
+ ' | ' .
html::escapeHTML(__('No version available on stores')) . ' | ';
}
- echo
+ echo
'
';
}
diff --git a/src/CsvStore.php b/src/CsvStore.php
index 320dd78..f2e9913 100644
--- a/src/CsvStore.php
+++ b/src/CsvStore.php
@@ -10,73 +10,78 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
-if (!defined('DC_RC_PATH')) {
- return null;
-}
-
-class csvStore extends dcStore
-{
- # overwrite dcStore::check to remove cache and use csvStoreReader and check disabled modules
- public function check($force = true)
- {
- if (!$this->xml_url) {
- return false;
- }
-
- try {
- $parser = DC_STORE_NOT_UPDATE ? false : csvStoreReader::quickParse($this->xml_url, DC_TPL_CACHE, $force);
- } catch (Exception $e) {
- return false;
- }
-
- $raw_datas = !$parser ? [] : $parser->getModules();
-
- uasort($raw_datas, fn ($a, $b) => strtolower($a['id']) <=> strtolower($b['id']));
-
- $updates = [];
- $current = array_merge($this->modules->getModules(), $this->modules->getDisabledModules());
- foreach ($current as $p_id => $p_infos) {
- # non privileged user has no info
- if (!is_array($p_infos)) {
- continue;
- }
- # main repository
- if (isset($raw_datas[$p_id])) {
- if (dcUtils::versionsCompare($raw_datas[$p_id]['version'], $p_infos['version'], '>=')) {
- $updates[$p_id] = $raw_datas[$p_id];
- $updates[$p_id]['root'] = $p_infos['root'];
- $updates[$p_id]['root_writable'] = $p_infos['root_writable'];
- $updates[$p_id]['current_version'] = $p_infos['version'];
- }
- unset($raw_datas[$p_id]);
- }
- # per module third-party repository
- if (!empty($p_infos['repository']) && DC_ALLOW_REPOSITORIES) {
- try {
- $dcs_url = substr($p_infos['repository'], -12, 12) == '/dcstore.xml' ? $p_infos['repository'] : http::concatURL($p_infos['repository'], 'dcstore.xml');
- $dcs_parser = csvStoreReader::quickParse($dcs_url, DC_TPL_CACHE, $force);
- if ($dcs_parser !== false) {
- $dcs_raw_datas = $dcs_parser->getModules();
- if (isset($dcs_raw_datas[$p_id]) && dcUtils::versionsCompare($dcs_raw_datas[$p_id]['version'], $p_infos['version'], '>=')) {
- if (!isset($updates[$p_id]) || dcUtils::versionsCompare($dcs_raw_datas[$p_id]['version'], $updates[$p_id]['version'], '>=')) {
- $dcs_raw_datas[$p_id]['repository'] = true;
- $updates[$p_id] = $dcs_raw_datas[$p_id];
- $updates[$p_id]['root'] = $p_infos['root'];
- $updates[$p_id]['root_writable'] = $p_infos['root_writable'];
- $updates[$p_id]['current_version'] = $p_infos['version'];
- }
- }
- }
- } catch (Exception $e) {
- }
- }
- }
-
- $this->data = [
- 'new' => [],
- 'update' => $updates,
- ];
-
- return true;
- }
-}
\ No newline at end of file
+declare(strict_types=1);
+
+namespace Dotclear\Plugin\checkStoreVersion;
+
+use dcStore;
+use dcUtils;
+use Exception;
+use http;
+
+class CsvStore extends dcStore
+{
+ # overwrite dcStore::check to remove cache and use csvStoreReader and check disabled modules
+ public function check(bool $force = true): bool
+ {
+ if (!$this->xml_url) {
+ return false;
+ }
+
+ try {
+ $parser = DC_STORE_NOT_UPDATE ? false : CsvStoreReader::quickParse($this->xml_url, DC_TPL_CACHE, $force);
+ } catch (Exception $e) {
+ return false;
+ }
+
+ $raw_datas = !$parser ? [] : $parser->getModules();
+
+ uasort($raw_datas, fn ($a, $b) => strtolower($a['id']) <=> strtolower($b['id']));
+
+ $updates = [];
+ $current = array_merge($this->modules->getModules(), $this->modules->getDisabledModules());
+ foreach ($current as $p_id => $p_infos) {
+ # non privileged user has no info
+ if (!is_array($p_infos)) {
+ continue;
+ }
+ # main repository
+ if (isset($raw_datas[$p_id])) {
+ if (dcUtils::versionsCompare($raw_datas[$p_id]['version'], $p_infos['version'], '>=')) {
+ $updates[$p_id] = $raw_datas[$p_id];
+ $updates[$p_id]['root'] = $p_infos['root'];
+ $updates[$p_id]['root_writable'] = $p_infos['root_writable'];
+ $updates[$p_id]['current_version'] = $p_infos['version'];
+ }
+ unset($raw_datas[$p_id]);
+ }
+ # per module third-party repository
+ if (!empty($p_infos['repository']) && DC_ALLOW_REPOSITORIES) {
+ try {
+ $dcs_url = substr($p_infos['repository'], -12, 12) == '/dcstore.xml' ? $p_infos['repository'] : http::concatURL($p_infos['repository'], 'dcstore.xml');
+ $dcs_parser = CsvStoreReader::quickParse($dcs_url, DC_TPL_CACHE, $force);
+ if ($dcs_parser !== false) {
+ $dcs_raw_datas = $dcs_parser->getModules();
+ if (isset($dcs_raw_datas[$p_id]) && dcUtils::versionsCompare($dcs_raw_datas[$p_id]['version'], $p_infos['version'], '>=')) {
+ if (!isset($updates[$p_id]) || dcUtils::versionsCompare($dcs_raw_datas[$p_id]['version'], $updates[$p_id]['version'], '>=')) {
+ $dcs_raw_datas[$p_id]['repository'] = true;
+ $updates[$p_id] = $dcs_raw_datas[$p_id];
+ $updates[$p_id]['root'] = $p_infos['root'];
+ $updates[$p_id]['root_writable'] = $p_infos['root_writable'];
+ $updates[$p_id]['current_version'] = $p_infos['version'];
+ }
+ }
+ }
+ } catch (Exception $e) {
+ }
+ }
+ }
+
+ $this->data = [
+ 'new' => [],
+ 'update' => $updates,
+ ];
+
+ return true;
+ }
+}
diff --git a/src/CsvStoreParser.php b/src/CsvStoreParser.php
index 1832722..a45c0a8 100644
--- a/src/CsvStoreParser.php
+++ b/src/CsvStoreParser.php
@@ -10,48 +10,50 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
-if (!defined('DC_RC_PATH')) {
- return null;
-}
-
-class csvStoreParser extends dcStoreParser
-{
- # overwrite dcStoreParser to bypasse current dotclear version
- protected function _parse()
- {
- if (empty($this->xml->module)) {
- return;
- }
-
- foreach ($this->xml->module as $i) {
- $attrs = $i->attributes();
-
- $item = [];
-
- # DC/DA shared markers
- $item['id'] = (string) $attrs['id'];
- $item['file'] = (string) $i->file;
- $item['label'] = (string) $i->name; // deprecated
- $item['name'] = (string) $i->name;
- $item['version'] = (string) $i->version;
- $item['author'] = (string) $i->author;
- $item['desc'] = (string) $i->desc;
-
- # DA specific markers
- $item['dc_min'] = (string) $i->children(self::$bloc)->dcmin;
- $item['details'] = (string) $i->children(self::$bloc)->details;
- $item['section'] = (string) $i->children(self::$bloc)->section;
- $item['support'] = (string) $i->children(self::$bloc)->support;
- $item['sshot'] = (string) $i->children(self::$bloc)->sshot;
-
- $tags = [];
- foreach ($i->children(self::$bloc)->tags as $t) {
- $tags[] = (string) $t->tag;
- }
- $item['tags'] = implode(', ', $tags);
-
- # No more filters here, return all modules
- $this->items[$item['id']] = $item;
- }
- }
-}
\ No newline at end of file
+declare(strict_types=1);
+
+namespace Dotclear\Plugin\checkStoreVersion;
+
+use dcStoreParser;
+
+class CsvStoreParser extends dcStoreParser
+{
+ # overwrite dcStoreParser to bypasse current dotclear version
+ protected function _parse()
+ {
+ if (empty($this->xml->module)) {
+ return;
+ }
+
+ foreach ($this->xml->module as $i) {
+ $attrs = $i->attributes();
+
+ $item = [];
+
+ # DC/DA shared markers
+ $item['id'] = (string) $attrs['id'];
+ $item['file'] = (string) $i->file;
+ $item['label'] = (string) $i->name; // deprecated
+ $item['name'] = (string) $i->name;
+ $item['version'] = (string) $i->version;
+ $item['author'] = (string) $i->author;
+ $item['desc'] = (string) $i->desc;
+
+ # DA specific markers
+ $item['dc_min'] = (string) $i->children(self::$bloc)->dcmin;
+ $item['details'] = (string) $i->children(self::$bloc)->details;
+ $item['section'] = (string) $i->children(self::$bloc)->section;
+ $item['support'] = (string) $i->children(self::$bloc)->support;
+ $item['sshot'] = (string) $i->children(self::$bloc)->sshot;
+
+ $tags = [];
+ foreach ($i->children(self::$bloc)->tags as $t) {
+ $tags[] = (string) $t->tag;
+ }
+ $item['tags'] = implode(', ', $tags);
+
+ # No more filters here, return all modules
+ $this->items[$item['id']] = $item;
+ }
+ }
+}
diff --git a/src/CsvStoreReader.php b/src/CsvStoreReader.php
index a577b7d..b607847 100644
--- a/src/CsvStoreReader.php
+++ b/src/CsvStoreReader.php
@@ -10,25 +10,31 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
-class csvStoreReader extends dcStoreReader
-{
- # overwrite dcStoreReader to remove cache and use mvStoreParser
- public function parse($url)
- {
- $this->validators = [];
-
- if (!$this->getModulesXML($url) || $this->getStatus() != '200') {
- return false;
- }
-
- return new csvStoreParser($this->getContent());
- }
-
- # overwrite dcStoreReader to remove cache and use mvStoreParser
- public static function quickParse($url, $cache_dir = null, $force = true)
- {
- $parser = new self();
-
- return $parser->parse($url);
- }
-}
+declare(strict_types=1);
+
+namespace Dotclear\Plugin\checkStoreVersion;
+
+use dcStoreReader;
+
+class CsvStoreReader extends dcStoreReader
+{
+ # overwrite dcStoreReader to remove cache and use mvStoreParser
+ public function parse($url)
+ {
+ $this->validators = [];
+
+ if (!$this->getModulesXML($url) || $this->getStatus() != '200') {
+ return false;
+ }
+
+ return new CsvStoreParser($this->getContent());
+ }
+
+ # overwrite dcStoreReader to remove cache and use mvStoreParser
+ public static function quickParse($url, $cache_dir = null, $force = true)
+ {
+ $parser = new self();
+
+ return $parser->parse($url);
+ }
+}
diff --git a/src/My.php b/src/My.php
new file mode 100644
index 0000000..6d0fdaa
--- /dev/null
+++ b/src/My.php
@@ -0,0 +1,20 @@
+