From 4218708e39dedb1c6c7e8dd464c8265f197a24da Mon Sep 17 00:00:00 2001
From: Kevin Ditscheid <kevin.ditscheid@sgalinski.de>
Date: Wed, 23 Jan 2019 12:10:45 +0100
Subject: [PATCH] [TASK] Remove extendedIf ViewHelper
---
Classes/ViewHelpers/ExtendedIfViewHelper.php | 95 -------------------
.../Private/Templates/PageBrowser/Index.html | 8 +-
.../Templates/SingleView/SingleView.html | 4 +-
3 files changed, 6 insertions(+), 101 deletions(-)
delete mode 100644 Classes/ViewHelpers/ExtendedIfViewHelper.php
diff --git a/Classes/ViewHelpers/ExtendedIfViewHelper.php b/Classes/ViewHelpers/ExtendedIfViewHelper.php
deleted file mode 100644
index 15bdd04..0000000
--- a/Classes/ViewHelpers/ExtendedIfViewHelper.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace SGalinski\SgNews\ViewHelpers;
-
-/***************************************************************
- * Copyright notice
- *
- * (c) sgalinski Internet Services (https://www.sgalinski.de)
- *
- * All rights reserved
- *
- * This script is part of the TYPO3 project. The TYPO3 project is
- * free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * The GNU General Public License can be found at
- * http://www.gnu.org/copyleft/gpl.html.
- *
- * This script is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
-
-/**
- * ExtendedIfViewHelper
- */
-class ExtendedIfViewHelper extends AbstractConditionViewHelper {
- /**
- * Initializes the "then" and "else" arguments
- */
- public function initializeArguments() {
- parent::initializeArguments();
- if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 8000000) {
- $this->registerArgument(
- 'condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
- );
- }
- $this->registerArgument(
- 'or', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
- );
- $this->registerArgument(
- 'or2', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
- );
- $this->registerArgument(
- 'or3', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
- );
- $this->registerArgument(
- 'or4', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
- );
- $this->registerArgument(
- 'and', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, TRUE
- );
- $this->registerArgument(
- 'and2', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, TRUE
- );
- $this->registerArgument(
- 'and3', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, TRUE
- );
- $this->registerArgument(
- 'and4', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, TRUE
- );
- $this->registerArgument(
- 'negate', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
- );
- }
-
- /**
- * This method decides if the condition is TRUE or FALSE. It can be overriden in extending viewhelpers to adjust functionality.
- *
- * @param array $arguments ViewHelper arguments to evaluate the condition for this ViewHelper, allows for flexiblity in overriding this method.
- * @return bool
- */
- static protected function evaluateCondition($arguments = NULL) {
- $conditionResult = (
- isset($arguments['condition']) && $arguments['condition'] ||
- isset($arguments['or']) && $arguments['or'] ||
- isset($arguments['or2']) && $arguments['or2'] ||
- isset($arguments['or3']) && $arguments['or3'] ||
- isset($arguments['or4']) && $arguments['or4']
- ) && isset($arguments['and']) && $arguments['and'] &&
- isset($arguments['and2']) && $arguments['and2'] &&
- isset($arguments['and3']) && $arguments['and3'] &&
- isset($arguments['and4']) && $arguments['and4'];
-
- return isset($arguments['negate']) && $arguments['negate'] ? !$conditionResult : $conditionResult;
- }
-}
diff --git a/Resources/Private/Templates/PageBrowser/Index.html b/Resources/Private/Templates/PageBrowser/Index.html
index 2087a37..3350986 100644
--- a/Resources/Private/Templates/PageBrowser/Index.html
+++ b/Resources/Private/Templates/PageBrowser/Index.html
@@ -24,13 +24,13 @@
</f:else>
</f:if>
- <sg:extendedIf condition="{enableLessPages}" and="{showLessPages}">
+ <f:if condition="{enableLessPages} && {showLessPages}">
<li>
<a href="{enableLessPagesLink}">
...
</a>
</li>
- </sg:extendedIf>
+ </f:if>
<f:for each="{pageLinks}" as="pageLink">
<f:if condition="{pageLink.isCurrentPage}">
@@ -54,13 +54,13 @@
</f:if>
</f:for>
- <sg:extendedIf condition="{enableMorePages}" and="{showNextPages}">
+ <f:if condition="{enableMorePages} && {showNextPages}">
<li>
<a href="{enableMorePagesLink}">
...
</a>
</li>
- </sg:extendedIf>
+ </f:if>
<f:if condition="{nextPageExist}">
<f:then>
diff --git a/Resources/Private/Templates/SingleView/SingleView.html b/Resources/Private/Templates/SingleView/SingleView.html
index 3fcc2c1..434e1ee 100644
--- a/Resources/Private/Templates/SingleView/SingleView.html
+++ b/Resources/Private/Templates/SingleView/SingleView.html
@@ -163,7 +163,7 @@
<section class="content dark-bg">
<div class="container">
<div class="tx-sgnews-single-footer">
- <sg:extendedIf condition="{previousNews}" or="{nextNews}">
+ <f:if condition="{previousNews} || {nextNews}">
<div class="tx-sgnews-single-footer-browser">
<f:if condition="{previousNews}">
<a href="{f:uri.page(pageUid: '{previousNews.uid}')}" class="btn btn-md btn-info tx-sgnews-footer-browser-previous">
@@ -177,7 +177,7 @@
</a>
</f:if>
</div>
- </sg:extendedIf>
+ </f:if>
</div>
</div>
</section>
--
GitLab