Skip to content

Commit

Permalink
* bugfix: ###FE_GROUP_0_TEMPLATE### if no frontend user has logged in…
Browse files Browse the repository at this point in the history
… must check for the group=-1 and not for 0. Every logged in frontend user is member of group 0 now!

* bugfix: markers must be uppercase. ###FE_CONDITION1_FALSE_TEMPLATE###
  • Loading branch information
franzholz committed Mar 9, 2020
1 parent 05fa58e commit 947738c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2020-03-09 Franz Holzinger <[email protected]>
* bugfix: ###FE_GROUP_0_TEMPLATE### if no frontend user has logged in must check for the group=-1 and not for 0. Every logged in frontend user is member of group 0 now!
* bugfix: markers must be uppercase. ###FE_CONDITION1_FALSE_TEMPLATE###

2020-03-07 Franz Holzinger <[email protected]>
* bugfix: resolve issues where the count function might be applied on a variable which is not an array
Expand Down
7 changes: 3 additions & 4 deletions template/products_css_variants_de.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ <h3>ITEM_LIST_TEMPLATE</h3>
This subpart is used to display the regular list of products. It's also used by search-results.-->


<!-- ###FE_GROUP_0_TEMPLATE### begin -->
Sie sind nicht angemeldet!
<!-- ###FE_GROUP_0_TEMPLATE### end -->
<!-- ###FE_GROUP_1_TEMPLATE### begin -->
Sie sind angemeldet!
<!-- ###FE_GROUP_1_TEMPLATE### end -->
Expand Down Expand Up @@ -267,9 +269,6 @@ <h3>ITEM_LIST_RELATED_TEMPLATE</h3>

<h3>&auml;hnliche Produkte</h3>

<!-- ###FE_GROUP_1_TEMPLATE### begin -->
Sie sind eingeloggt!
<!-- ###FE_GROUP_1_TEMPLATE### end -->
<!--###LINK_PREV###-->###GW2B###<div align="left"><b>vorherige Seite</b>###GW2E###</div><!--###LINK_PREV###-->
<!-- ###LINK_BROWSE### begin -->
[ ###BROWSE_LINKS### ]
Expand Down
18 changes: 11 additions & 7 deletions view/class.tx_ttproducts_orderaddress_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ public function getWrappedSubpartArray(
$groupNumber = substr($tagPart1, 0, $offset);

if (tx_div2007_core::testInt($groupNumber)) {
if (GeneralUtility::inList($GLOBALS['TSFE']->gr_list, $groupNumber)) {
$comparatorNumber = $groupNumber;
if (!$comparatorNumber) {
$comparatorNumber = -1; // Also a logged in Front End User has group 0!
}
if (GeneralUtility::inList($GLOBALS['TSFE']->gr_list, $comparatorNumber)) {
$wrappedSubpartArray['###FE_GROUP_' . $groupNumber . '_TEMPLATE###'] = array('', '');
} else {
$subpartArray['###FE_GROUP_' . $groupNumber . '_TEMPLATE###'] = '';
Expand Down Expand Up @@ -99,15 +103,15 @@ public function getWrappedSubpartArray(
}

if (
isset($viewTagArray['FE_CONDITION1_true_TEMPLATE']) ||
isset($viewTagArray['FE_CONDITION1_false_TEMPLATE'])
isset($viewTagArray['FE_CONDITION1_TRUE_TEMPLATE']) ||
isset($viewTagArray['FE_CONDITION1_FALSE_TEMPLATE'])
) {
if ($this->getModelObj()->getCondition() || !$this->getModelObj()->getConditionRecord()) {
$wrappedSubpartArray['###FE_CONDITION1_true_TEMPLATE###'] = array('', '');
$subpartArray['###FE_CONDITION1_false_TEMPLATE###'] = '';
$wrappedSubpartArray['###FE_CONDITION1_TRUE_TEMPLATE###'] = array('', '');
$subpartArray['###FE_CONDITION1_FALSE_TEMPLATE###'] = '';
} else {
$wrappedSubpartArray['###FE_CONDITION1_false_TEMPLATE###'] = array('', '');
$subpartArray['###FE_CONDITION1_true_TEMPLATE###'] = '';
$wrappedSubpartArray['###FE_CONDITION1_FALSE_TEMPLATE###'] = array('', '');
$subpartArray['###FE_CONDITION1_TRUE_TEMPLATE###'] = '';
}
}
}
Expand Down

0 comments on commit 947738c

Please sign in to comment.