Skip to content

Commit

Permalink
version-plugin: Konstanten nutzen (#5303)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gharlan
gharlan committed Aug 13, 2022
1 parent 1a0dd0e commit 580139e
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 20 deletions.
5 changes: 5 additions & 0 deletions .tools/phpstan/baseline.neon
View file
Expand Up @@ -2445,6 +2445,11 @@ parameters:
count: 1
path: ../../redaxo/src/addons/structure/plugins/history/lib/history_login.php

-
message: "#^If condition is always false\\.$#"
count: 1
path: ../../redaxo/src/addons/structure/plugins/version/lib/revision.php

-
message: "#^Method rex_article_test\\:\\:testGetValue\\(\\) has no return type specified\\.$#"
count: 1
Expand Down
28 changes: 14 additions & 14 deletions redaxo/src/addons/structure/plugins/version/boot.php
View file
Expand Up @@ -12,7 +12,7 @@

// ***** an EPs andocken
rex_extension::register('ART_INIT', static function (rex_extension_point $ep) {
$version = rex_request(rex_version::class, 'int');
$version = rex_request('rex_version', 'int');
if (rex_article_revision::WORK != $version) {
return;
}
Expand Down Expand Up @@ -46,14 +46,14 @@
$version = rex_article_revision::getSessionArticleRevision($articleId);
$newVersion = rex_request('rex_set_version', 'int', null);

if (0 === $newVersion) {
$version = 0;
} elseif (1 === $newVersion) {
$version = 1;
if (rex_article_revision::LIVE === $newVersion) {
$version = rex_article_revision::LIVE;
} elseif (rex_article_revision::WORK === $newVersion) {
$version = rex_article_revision::WORK;
}

if (!rex::requireUser()->hasPerm('version[live_version]')) {
$version = 1;
$version = rex_article_revision::WORK;
}

rex_article_revision::setSessionArticleRevision($articleId, $version);
Expand Down Expand Up @@ -93,14 +93,14 @@
$return .= rex_view::success(rex_i18n::msg('version_info_working_version_to_live'));

$article = rex_type::instanceOf(rex_article::get($articleId, $clangId), rex_article::class);
rex_article_revision::setSessionArticleRevision($articleId, 0);
rex_article_revision::setSessionArticleRevision($articleId, rex_article_revision::LIVE);
$return = rex_extension::registerPoint(new rex_extension_point_art_content_updated($article, 'work_to_live', $return));
}
break;
case 'copy_live_to_work':
rex_article_revision::copyContent($articleId, $clangId, rex_article_revision::LIVE, rex_article_revision::WORK);
$return .= rex_view::success(rex_i18n::msg('version_info_live_version_to_working'));
rex_article_revision::setSessionArticleRevision($articleId, 1);
rex_article_revision::setSessionArticleRevision($articleId, rex_article_revision::WORK);
break;
case 'clear_work':
rex_article_revision::clearContent($articleId, $clangId, rex_article_revision::WORK);
Expand All @@ -112,9 +112,9 @@

$revisions = [];
if ($user->hasPerm('version[live_version]')) {
$revisions[0] = rex_i18n::msg('version_liveversion');
$revisions[rex_article_revision::LIVE] = rex_i18n::msg('version_liveversion');
}
$revisions[1] = rex_i18n::msg('version_workingversion');
$revisions[rex_article_revision::WORK] = rex_i18n::msg('version_workingversion');

$context = new rex_context([
'page' => $params['page'],
Expand Down Expand Up @@ -152,22 +152,22 @@
if (!$user->hasPerm('version[live_version]')) {
if ($revision > 0) {
$toolbar .= '<li><a href="' . $context->getUrl(['rex_version_func' => 'copy_live_to_work']) . '">' . rex_i18n::msg('version_copy_from_liveversion') . '</a></li>';
$toolbar .= '<li><a href="' . rex_getUrl($articleId, $clangId, [rex_version::class => 1]) . '" rel="noopener noreferrer" target="_blank">' . rex_i18n::msg('version_preview') . '</a></li>';
$toolbar .= '<li><a href="' . rex_getUrl($articleId, $clangId, ['rex_version' => rex_article_revision::WORK]) . '" rel="noopener noreferrer" target="_blank">' . rex_i18n::msg('version_preview') . '</a></li>';
}
} else {
if ($revision > 0) {
if (!$workingVersionEmpty) {
$toolbar .= '<li><a href="' . $context->getUrl(['rex_version_func' => 'clear_work']) . '" data-confirm="' . rex_i18n::msg('version_confirm_clear_workingversion') . '">' . rex_i18n::msg('version_clear_workingversion') . '</a></li>';
$toolbar .= '<li><a href="' . $context->getUrl(['rex_version_func' => 'copy_work_to_live']) . '">' . rex_i18n::msg('version_working_to_live') . '</a></li>';
}
$toolbar .= '<li><a href="' . rex_getUrl($articleId, $clangId, [rex_version::class => 1]) . '" rel="noopener noreferrer" target="_blank">' . rex_i18n::msg('version_preview') . '</a></li>';
$toolbar .= '<li><a href="' . rex_getUrl($articleId, $clangId, ['rex_version' => rex_article_revision::WORK]) . '" rel="noopener noreferrer" target="_blank">' . rex_i18n::msg('version_preview') . '</a></li>';
} else {
$toolbar .= '<li><a href="' . $context->getUrl(['rex_version_func' => 'copy_live_to_work']) . '" data-confirm="' . rex_i18n::msg('version_confirm_copy_live_to_workingversion') . '">' . rex_i18n::msg('version_copy_live_to_workingversion') . '</a></li>';
}
}

$inverse = 1 == $revision;
$cssClass = 1 == $revision ? 'rex-state-inprogress' : 'rex-state-live';
$inverse = rex_article_revision::WORK == $revision;
$cssClass = rex_article_revision::WORK == $revision ? 'rex-state-inprogress' : 'rex-state-live';

$return .= rex_view::toolbar('<ul class="nav navbar-nav">' . $toolbar . '</ul>', null, $cssClass, $inverse);

Expand Down
14 changes: 8 additions & 6 deletions redaxo/src/addons/structure/plugins/version/lib/revision.php
View file
Expand Up @@ -11,8 +11,8 @@ class rex_article_revision
/**
* @param int $articleId
* @param int $clang
* @param int $fromRevisionId
* @param int $toRevisionId
* @param self::LIVE|self::WORK $fromRevisionId
* @param self::LIVE|self::WORK $toRevisionId
*
* @return bool
*/
Expand Down Expand Up @@ -56,7 +56,7 @@ public static function copyContent($articleId, $clang, $fromRevisionId, $toRevis
/**
* @param int $articleId
* @param int $clang
* @param int $fromRevisionId
* @param self::WORK $fromRevisionId
*
* @return true
*/
Expand All @@ -73,22 +73,24 @@ public static function clearContent($articleId, $clang, $fromRevisionId)
return true;
}

/** @param self::LIVE|self::WORK $revision */
public static function setSessionArticleRevision(int $articleId, int $revision): void
{
$login = rex::getProperty('login');
/** @var array<int, 0|1>|null $revisions */
/** @var array<int, self::LIVE|self::WORK>|null $revisions */
$revisions = $login->getSessionVar('rex_version_article', []);
$revisions = is_array($revisions) ? $revisions : [];

$revisions[$articleId] = $revision;
$login->setSessionVar('rex_version_article', $revisions);
}

/** @return self::LIVE|self::WORK */
public static function getSessionArticleRevision(int $articleId): int
{
/** @var array<int, 0|1> $revisions */
/** @var array<int, self::LIVE|self::WORK> $revisions */
$revisions = rex::getProperty('login')->getSessionVar('rex_version_article', []);

return (int) ($revisions[$articleId] ?? 1);
return (int) ($revisions[$articleId] ?? self::WORK);
}
}

0 comments on commit 580139e

Please sign in to comment.