diff options
| author |  maTh <1645099+math-GH@users.noreply.github.com>
| 2024-04-25 08:28:42 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-04-25 08:28:42 +0200 |
| commit | 154a36700c80191121afec00b026daba5ff97dc8 (patch) | |
| tree | a0693104fd8232fb85d5d25c34f3700efd40c1e2 /app/views/helpers | |
| parent | 5e66adcc51446fe93b2cba7c25e28a06d9903223 (diff) | |
Refactoring: Rename dotpath into dotnotation (#6369)
* KIND_JSON_DOTPATH -> KIND_JSON_DOTNOTATION
* TYPE_JSON_DOTPATH => TYPE_JSON_DOTNOTATION
* json_dotpath => json_dotnotation
* dotPathsForStandardJsonFeed => dotNotationForStandardJsonFeed
* TYPE_JSON_DOTNOTATION = 'JSON+DotPath' => 'JSON+DotNotation'
* documentation: OPML.md
* convertJsonToRss()
* $dotpaths => $dotnotations
* FreshRSS_Feed_Exception
* comment
* Compatibility TYPE_JSON_DOTPATH
---------
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat (limited to 'app/views/helpers')
| -rw-r--r-- | app/views/helpers/export/opml.phtml | 8 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/helpers/export/opml.phtml b/app/views/helpers/export/opml.phtml index 0b53a1ce4..5a5ba5432 100644 --- a/app/views/helpers/export/opml.phtml +++ b/app/views/helpers/export/opml.phtml @@ -27,8 +27,8 @@ function feedsToOutlines(array $feeds, bool $excludeMutedFeeds = false): array { case FreshRSS_Feed::KIND_XML_XPATH: $outline['type'] = FreshRSS_Export_Service::TYPE_XML_XPATH; break; - case FreshRSS_Feed::KIND_JSON_DOTPATH: - $outline['type'] = FreshRSS_Export_Service::TYPE_JSON_DOTPATH; + case FreshRSS_Feed::KIND_JSON_DOTNOTATION: + $outline['type'] = FreshRSS_Export_Service::TYPE_JSON_DOTNOTATION; break; case FreshRSS_Feed::KIND_JSONFEED: $outline['type'] = FreshRSS_Export_Service::TYPE_JSONFEED; @@ -48,9 +48,9 @@ function feedsToOutlines(array $feeds, bool $excludeMutedFeeds = false): array { $outline['frss:xPathItemThumbnail'] = $xPathSettings['itemThumbnail'] ?? null; $outline['frss:xPathItemCategories'] = $xPathSettings['itemCategories'] ?? null; $outline['frss:xPathItemUid'] = $xPathSettings['itemUid'] ?? null; - } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTPATH) { + } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTNOTATION) { /** @var array<string,string> */ - $jsonSettings = $feed->attributeArray('json_dotpath') ?? []; + $jsonSettings = $feed->attributeArray('json_dotnotation') ?? []; $outline['frss:jsonItem'] = $jsonSettings['item'] ?? null; $outline['frss:jsonItemTitle'] = $jsonSettings['itemTitle'] ?? null; $outline['frss:jsonItemContent'] = $jsonSettings['itemContent'] ?? null; diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 5c88466a0..125e28253 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -413,7 +413,7 @@ <option value="<?= FreshRSS_Feed::KIND_HTML_XPATH ?>" <?= $this->feed->kind() === FreshRSS_Feed::KIND_HTML_XPATH ? 'selected="selected"' : '' ?> data-show="html_xpath"><?= _t('sub.feed.kind.html_xpath') ?></option> <option value="<?= FreshRSS_Feed::KIND_XML_XPATH ?>" <?= $this->feed->kind() === FreshRSS_Feed::KIND_XML_XPATH ? 'selected="selected"' : '' ?> data-show="html_xpath"><?= _t('sub.feed.kind.xml_xpath') ?></option> <option value="<?= FreshRSS_Feed::KIND_JSONFEED ?>" <?= $this->feed->kind() === FreshRSS_Feed::KIND_JSONFEED ? 'selected="selected"' : '' ?>><?= _t('sub.feed.kind.jsonfeed') ?></option> - <option value="<?= FreshRSS_Feed::KIND_JSON_DOTPATH ?>" <?= $this->feed->kind() === FreshRSS_Feed::KIND_JSON_DOTPATH ? 'selected="selected"' : '' ?> data-show="json_dotpath"><?= _t('sub.feed.kind.json_dotnotation') ?></option> + <option value="<?= FreshRSS_Feed::KIND_JSON_DOTNOTATION ?>" <?= $this->feed->kind() === FreshRSS_Feed::KIND_JSON_DOTNOTATION ? 'selected="selected"' : '' ?> data-show="json_dotnotation"><?= _t('sub.feed.kind.json_dotnotation') ?></option> </select> </div> </div> @@ -514,9 +514,9 @@ </div> </fieldset> - <fieldset id="json_dotpath"> + <fieldset id="json_dotnotation"> <?php - $jsonSettings = Minz_Helper::htmlspecialchars_utf8($this->feed->attributeArray('json_dotpath') ?? []); + $jsonSettings = Minz_Helper::htmlspecialchars_utf8($this->feed->attributeArray('json_dotnotation') ?? []); ?> <p class="help"><?= _i('help') ?> <?= _t('sub.feed.kind.json_dotnotation.help') ?></p> <div class="form-group"> |