Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement #4

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Improvement #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e03150e
Replace 1 tab with 4 spaces.
sergeykalenyuk Sep 16, 2014
58162bf
Do not add view/preview link at the default scope.
sergeykalenyuk Sep 16, 2014
aaae109
Add preview link only if the product is available on frontend.
sergeykalenyuk Sep 16, 2014
ace7292
Add store id to the preview link.
sergeykalenyuk Sep 16, 2014
18cfd80
Enable either view or preview link, not both.
sergeykalenyuk Sep 16, 2014
ca8a374
Remove hashed key in favor of the HTTP Basic Auth.
sergeykalenyuk Sep 16, 2014
9947b57
Do not add view/preview link if the product is not assigned to the cu…
sergeykalenyuk Sep 16, 2014
9fc257e
Show the view/preview url when isSingleStoreMode() is true.
sergeykalenyuk Sep 25, 2014
8b25447
Add "Use HTTP Basic Auth" flag to System > Configuration > Catalog > …
sergeykalenyuk Sep 25, 2014
50fc949
Apply "Use HTTP Basic Auth" flag.
sergeykalenyuk Sep 25, 2014
9b1ecad
Use specified store on product preview page.
sergeykalenyuk Sep 26, 2014
299b2a1
Fix product preview for the admin domain that is different than the f…
sergeykalenyuk Oct 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply "Use HTTP Basic Auth" flag.
  • Loading branch information
@sergeykalenyuk
sergeykalenyuk committed Sep 25, 2014
commit 50fc949641efe86a68a50937cb9535d647ece936
2 changes: 1 addition & 1 deletion app/code/community/Tadic/AVP/Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

class Tadic_AVP_Helper_Data extends Mage_Core_Helper_Abstract
{

const XML_PATH_HTTP_BASIC_AUTH_ENABLED = 'catalog/productpreview/http_basic_auth';
}
22 changes: 12 additions & 10 deletions app/code/community/Tadic/AVP/controllers/ProductController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@ public function preDispatch()
{
parent::preDispatch();

if (empty($_SERVER['PHP_AUTH_USER']) || empty($_SERVER['PHP_AUTH_PW'])) {
$this->_requestAuthentication();
}
if (Mage::getStoreConfigFlag(Tadic_AVP_Helper_Data::XML_PATH_HTTP_BASIC_AUTH_ENABLED)) {
if (empty($_SERVER['PHP_AUTH_USER']) || empty($_SERVER['PHP_AUTH_PW'])) {
$this->_requestAuthentication();
}

try {
$user = Mage::getModel('admin/user'); /** @var $user Mage_Admin_Model_User */
if ( ! $user->authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
Mage::throwException($this->__('Invalid login.'));
try {
$user = Mage::getModel('admin/user'); /** @var $user Mage_Admin_Model_User */
if ( ! $user->authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
Mage::throwException($this->__('Invalid login.'));
}
}
catch (Exception $e) {
$this->_requestAuthentication($e->getMessage());
}
}
catch (Exception $e) {
$this->_requestAuthentication($e->getMessage());
}
}

Expand Down