Skip to content

Commit

Permalink
Use POST instead of GET for managing favorite/pinned/watched items
Browse files Browse the repository at this point in the history
  • Loading branch information
@aimeos
aimeos committed Sep 18, 2021
1 parent b48a9f8 commit 2d596aa
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 66 deletions.
2 changes: 1 addition & 1 deletion client/html/src/Client/Html/Account/Favorite/Standard.php
View file
Expand Up @@ -285,7 +285,7 @@ public function process()

try
{
if( $context->getUserId() != null && !empty( $ids ) )
if( $context->getUserId() != null && !empty( $ids ) && $view->request()->getMethod() === 'POST' )
{
switch( $view->param( 'fav_action' ) )
{
Expand Down
2 changes: 1 addition & 1 deletion client/html/src/Client/Html/Account/Watch/Standard.php
View file
Expand Up @@ -286,7 +286,7 @@ public function process()

try
{
if( $context->getUserId() != null && !empty( $ids ) )
if( $context->getUserId() != null && !empty( $ids ) && $view->request()->getMethod() === 'POST' )
{
switch( $view->param( 'wat_action' ) )
{
Expand Down
79 changes: 41 additions & 38 deletions client/html/src/Client/Html/Catalog/Session/Pinned/Standard.php
View file
Expand Up @@ -229,45 +229,48 @@ public function process()
$session = $context->getSession();
$pinned = $session->get( 'aimeos/catalog/session/pinned/list', [] );

switch( $view->param( 'pin_action' ) )
if( $view->request()->getMethod() === 'POST' )
{
case 'add':

foreach( (array) $view->param( 'pin_id', [] ) as $id ) {
$pinned[$id] = $id;
}

/** client/html/catalog/session/pinned/maxitems
* Maximum number of products displayed in the "pinned" section
*
* This option limits the number of products that are shown in the
* "pinned" section after the users added the product to their list
* of pinned products. It must be a positive integer value greater
* than 0.
*
* Note: The higher the value is the more data has to be transfered
* to the client each time the user loads a page with the list of
* pinned products.
*
* @param integer Number of products
* @since 2014.09
* @category User
* @category Developer
*/
$max = $context->getConfig()->get( 'client/html/catalog/session/pinned/maxitems', 50 );

$pinned = array_slice( $pinned, -$max, $max, true );
$refresh = true;
break;

case 'delete':

foreach( (array) $view->param( 'pin_id', [] ) as $id ) {
unset( $pinned[$id] );
}

$refresh = true;
break;
switch( $view->param( 'pin_action' ) )
{
case 'add':

foreach( (array) $view->param( 'pin_id', [] ) as $id ) {
$pinned[$id] = $id;
}

/** client/html/catalog/session/pinned/maxitems
* Maximum number of products displayed in the "pinned" section
*
* This option limits the number of products that are shown in the
* "pinned" section after the users added the product to their list
* of pinned products. It must be a positive integer value greater
* than 0.
*
* Note: The higher the value is the more data has to be transfered
* to the client each time the user loads a page with the list of
* pinned products.
*
* @param integer Number of products
* @since 2014.09
* @category User
* @category Developer
*/
$max = $context->getConfig()->get( 'client/html/catalog/session/pinned/maxitems', 50 );

$pinned = array_slice( $pinned, -$max, $max, true );
$refresh = true;
break;

case 'delete':

foreach( (array) $view->param( 'pin_id', [] ) as $id ) {
unset( $pinned[$id] );
}

$refresh = true;
break;
}
}


Expand Down
7 changes: 4 additions & 3 deletions client/html/templates/account/favorite/body-standard.php
View file
Expand Up @@ -114,9 +114,10 @@

<li class="favorite-item">
<?php $params = ['fav_action' => 'delete', 'fav_id' => $listItem->getRefId()] + $this->get( 'favoriteParams', [] ) ?>
<a class="modify" href="<?= $enc->attr( $this->url( $favTarget, $favController, $favAction, $params, [], $favConfig ) ) ?>">
<?= $this->translate( 'client', 'X' ) ?>
</a>
<form method="POST" action="<?= $enc->attr( $this->url( $favTarget, $favController, $favAction, $params, [], $favConfig ) ) ?>">
<button class="minibutton delete" title="<?= $this->translate( 'client', 'Delete item' ) ?>"></button>
<?= $this->csrf()->formfield() ?>
</form>

<?php $params = array_diff_key( ['d_name' => $productItem->getName( 'url' ), 'd_prodid' => $productItem->getId(), 'd_pos' => ''], $detailFilter ) ?>
<a href="<?= $enc->attr( $this->url( $detailTarget, $detailController, $detailAction, $params, [], $detailConfig ) ) ?>">
Expand Down
5 changes: 4 additions & 1 deletion client/html/templates/account/watch/body-standard.php
View file
Expand Up @@ -113,7 +113,10 @@

<li class="watch-item">
<?php $params = ['wat_action' => 'delete', 'wat_id' => $listItem->getRefId()] + $this->get( 'watchParams', [] ) ?>
<a class="modify" href="<?= $this->url( $watchTarget, $watchController, $watchAction, $params, [], $watchConfig ) ?>"></a>
<form method="POST" action="<?= $enc->attr( $this->url( $watchTarget, $watchController, $watchAction, $params, [], $watchConfig ) ) ?>">
<button class="minibutton delete" title="<?= $this->translate( 'client', 'Delete item' ) ?>"></button>
<?= $this->csrf()->formfield() ?>
</form>

<?php $params = array_diff_key( ['d_name' => $productItem->getName( 'url' ), 'd_prodid' => $productItem->getId(), 'd_pos' => ''], $detailFilter ) ?>
<a class="watch-item" href="<?= $enc->attr( $this->url( $detailTarget, $detailController, $detailAction, $params, [], $detailConfig ) ) ?>">
Expand Down
7 changes: 5 additions & 2 deletions client/html/templates/catalog/actions-partial-standard.php
View file
Expand Up @@ -58,8 +58,11 @@
<div class="catalog-actions">
<?php foreach( $this->config( 'client/html/catalog/actions/list', ['pin', 'watch', 'favorite'] ) as $entry ) : ?>
<?php if( isset( $urls[$entry] ) ) : ?>
<a class="actions-button actions-button-<?= $enc->attr( $entry ) ?>" href="<?= $enc->attr( $urls[$entry] ) ?>" title="<?= $enc->attr( $this->translate( 'client/code', $entry ) ) ?>"></a>

<form method="POST" action="<?= $enc->attr( $urls[$entry] ) ?>">
<button class="actions-button actions-button-<?= $enc->attr( $entry ) ?>"
title="<?= $enc->attr( $this->translate( 'client/code', $entry ) ) ?>">
</button>
</form>
<?php endif ?>
<?php endforeach ?>
</div>
7 changes: 4 additions & 3 deletions client/html/templates/catalog/session/pinned-body-standard.php
View file
Expand Up @@ -118,9 +118,10 @@
<?php $detailParams = array_diff_key( ['d_name' => $productItem->getName( 'url' ), 'd_prodid' => $id, 'd_pos' => ''], $detailFilter ) ?>

<li class="pinned-item">
<a class="modify" title="<?= $enc->attr( $this->translate( 'client', 'Delete' ) ) ?>"
href="<?= $this->url( $pinTarget, $pinController, $pinAction, $pinParams, [], $pinConfig ) ?>">
</a>
<form method="POST" action="<?= $enc->attr( $this->url( $pinTarget, $pinController, $pinAction, $pinParams, [], $pinConfig ) ) ?>">
<button class="minibutton delete" title="<?= $this->translate( 'client', 'Delete item' ) ?>"></button>
<?= $this->csrf()->formfield() ?>
</form>

<a href="<?= $enc->attr( $this->url( $detailTarget, $detailController, $detailAction, $detailParams, [], $detailConfig ) ) ?>">

Expand Down
2 changes: 1 addition & 1 deletion client/html/tests/TestHelperHtml.php
View file
Expand Up @@ -58,7 +58,7 @@ public static function getView( $site = 'unittest', \Aimeos\MW\Config\Iface $con
$view->addHelper( 'csrf', $helper );

$psr17Factory = new \Nyholm\Psr7\Factory\Psr17Factory();
$helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, $psr17Factory->createServerRequest( 'GET', 'https://aimeos.org' ) );
$helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, $psr17Factory->createServerRequest( 'POST', 'https://aimeos.org' ) );
$view->addHelper( 'request', $helper );

$helper = new \Aimeos\MW\View\Helper\Response\Standard( $view, $psr17Factory->createResponse() );
Expand Down
31 changes: 15 additions & 16 deletions client/html/themes/default/aimeos.css
View file
Expand Up @@ -447,6 +447,12 @@ body .main-section {
border: 0;
}

.aimeos .minibutton.delete:after {
font: normal normal normal 14px/1 bootstrap-icons;
font-size: 100%;
content: "\f5de";
}

.aimeos .button-group {
text-align: center;
padding: 1rem 0;
Expand Down Expand Up @@ -2705,6 +2711,14 @@ html.no-js .catalog-filter-price:hover .price-lists {


/* Watched, favorite, suggested products and session items */

.account-watch .minibutton.delete,
.account-favorite .minibutton.delete {
position: absolute;
right: 1%;
top: 1%;
}

.account-watch,
.account-favorite,
.basket-related-bought,
Expand Down Expand Up @@ -3146,10 +3160,8 @@ html.no-js .catalog-filter-price:hover .price-lists {
}

.basket-standard-coupon .minibutton.delete:after {
font: normal normal normal 14px/1 FontAwesome;
font-size: 125%;
content: "\f2ed";
display: inline-block;
font-size: 125%;
}

@media (max-width: 480px) {
Expand Down Expand Up @@ -3220,13 +3232,6 @@ html.no-js .catalog-filter-price:hover .price-lists {
width: 2rem;
}

.basket-bulk .minibutton.delete:after {
font: normal normal normal 14px/1 bootstrap-icons;
display: inline-block;
content: "\f5de";
font-size: 100%;
}


/* Checkout */
.checkout-standard .steps {
Expand Down Expand Up @@ -3369,12 +3374,6 @@ html.no-js .catalog-filter-price:hover .price-lists {
top: 1%;
}

.checkout-standard-address .minibutton.delete:after {
font: normal normal normal 14px/1 FontAwesome;
font-size: 100%;
content: "\f00d";
}

.checkout-standard-address .item-address .modify {
float: right;
}
Expand Down

0 comments on commit 2d596aa

Please sign in to comment.