diff --git a/src/Application/Controller/Traits/accountTrait.php b/src/Application/Controller/Traits/accountTrait.php new file mode 100644 index 0000000..df02a5f --- /dev/null +++ b/src/Application/Controller/Traits/accountTrait.php @@ -0,0 +1,29 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Application\Controller\Traits; + +trait accountTrait +{ + protected $d3WebauthnLoginTemplate = 'd3webauthnaccountlogin.tpl'; + + public function __construct() + { + $this->addTplParam('oxLoginTpl', $this->_sThisLoginTemplate); + $this->_sThisLoginTemplate = $this->d3WebauthnLoginTemplate; + + parent::__construct(); + } +} \ No newline at end of file diff --git a/src/Application/views/tpl/d3webauthnaccountlogin.tpl b/src/Application/views/tpl/d3webauthnaccountlogin.tpl new file mode 100644 index 0000000..e296d02 --- /dev/null +++ b/src/Application/views/tpl/d3webauthnaccountlogin.tpl @@ -0,0 +1,9 @@ +[{include file=$oxLoginTpl}] + +[{capture name="d3JsFnc"}][{strip}] + [{* remove jqBootstrapValidation *}] + $("input,select,textarea").jqBootstrapValidation("destroy"); +[{/strip}][{/capture}] +[{oxscript add=$smarty.capture.d3JsFnc}] + +[{oxscript}] \ No newline at end of file diff --git a/src/IntelliSenseHelper.php b/src/IntelliSenseHelper.php index 73d4772..b8eb165 100755 --- a/src/IntelliSenseHelper.php +++ b/src/IntelliSenseHelper.php @@ -24,6 +24,17 @@ namespace D3\Webauthn\Modules\Application\Component namespace D3\Webauthn\Modules\Application\Controller { + + use OxidEsales\Eshop\Application\Controller\AccountController; + use OxidEsales\Eshop\Application\Controller\AccountDownloadsController; + use OxidEsales\Eshop\Application\Controller\AccountNewsletterController; + use OxidEsales\Eshop\Application\Controller\AccountNoticeListController; + use OxidEsales\Eshop\Application\Controller\AccountOrderController; + use OxidEsales\Eshop\Application\Controller\AccountPasswordController; + use OxidEsales\Eshop\Application\Controller\AccountRecommlistController; + use OxidEsales\Eshop\Application\Controller\AccountReviewController; + use OxidEsales\Eshop\Application\Controller\AccountUserController; + use OxidEsales\Eshop\Application\Controller\AccountWishlistController; use OxidEsales\Eshop\Application\Controller\OrderController; use OxidEsales\Eshop\Application\Controller\PaymentController; use OxidEsales\Eshop\Application\Controller\UserController; @@ -33,6 +44,26 @@ namespace D3\Webauthn\Modules\Application\Controller class d3_webauthn_OrderController_parent extends OrderController {} class d3_webauthn_PaymentController_parent extends PaymentController {} + + class d3_AccountController_Webauthn_parent extends AccountController {} + + class d3_AccountDownloadsController_Webauthn_parent extends AccountDownloadsController {} + + class d3_AccountNoticeListController_Webauthn_parent extends AccountNoticeListController {} + + class d3_AccountWishlistController_Webauthn_parent extends AccountWishlistController {} + + class d3_AccountRecommlistController_Webauthn_parent extends AccountRecommlistController {} + + class d3_AccountPasswordController_Webauthn_parent extends AccountPasswordController {} + + class d3_AccountNewsletterController_Webauthn_parent extends AccountNewsletterController {} + + class d3_AccountUserController_Webauthn_parent extends AccountUserController {} + + class d3_AccountOrderController_Webauthn_parent extends AccountOrderController {} + + class d3_AccountReviewController_Webauthn_parent extends AccountReviewController {} } namespace D3\Webauthn\Modules\Application\Controller\Admin diff --git a/src/Modules/Application/Controller/d3_AccountController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountController_Webauthn.php new file mode 100644 index 0000000..d6c3f74 --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountController_Webauthn extends d3_AccountController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountDownloadsController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountDownloadsController_Webauthn.php new file mode 100644 index 0000000..9b7aa6e --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountDownloadsController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountDownloadsController_Webauthn extends d3_AccountDownloadsController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountNewsletterController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountNewsletterController_Webauthn.php new file mode 100644 index 0000000..d3ee0fa --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountNewsletterController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountNewsletterController_Webauthn extends d3_AccountNewsletterController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountNoticeListController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountNoticeListController_Webauthn.php new file mode 100644 index 0000000..4535e3a --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountNoticeListController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountNoticeListController_Webauthn extends d3_AccountNoticeListController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountOrderController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountOrderController_Webauthn.php new file mode 100644 index 0000000..536dbc8 --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountOrderController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountOrderController_Webauthn extends d3_AccountOrderController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountPasswordController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountPasswordController_Webauthn.php new file mode 100644 index 0000000..444b002 --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountPasswordController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountPasswordController_Webauthn extends d3_AccountPasswordController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountRecommlistController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountRecommlistController_Webauthn.php new file mode 100644 index 0000000..b80515e --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountRecommlistController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountRecommlistController_Webauthn extends d3_AccountRecommlistController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountReviewController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountReviewController_Webauthn.php new file mode 100644 index 0000000..9f6c5bb --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountReviewController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountReviewController_Webauthn extends d3_AccountReviewController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountUserController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountUserController_Webauthn.php new file mode 100644 index 0000000..703212c --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountUserController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountUserController_Webauthn extends d3_AccountUserController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/Modules/Application/Controller/d3_AccountWishlistController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountWishlistController_Webauthn.php new file mode 100644 index 0000000..3598272 --- /dev/null +++ b/src/Modules/Application/Controller/d3_AccountWishlistController_Webauthn.php @@ -0,0 +1,23 @@ + + * @link http://www.oxidmodule.com + */ + +namespace D3\Webauthn\Modules\Application\Controller; + +use D3\Webauthn\Application\Controller\Traits\accountTrait; + +class d3_AccountWishlistController_Webauthn extends d3_AccountWishlistController_Webauthn_parent +{ + use accountTrait; +} \ No newline at end of file diff --git a/src/metadata.php b/src/metadata.php index c73fa72..1643aa1 100755 --- a/src/metadata.php +++ b/src/metadata.php @@ -25,12 +25,32 @@ use D3\Webauthn\Application\Controller\d3_account_webauthn; use D3\Webauthn\Application\Controller\d3webauthnlogin; use D3\Webauthn\Modules\Application\Component\d3_webauthn_UserComponent; use D3\Webauthn\Modules\Application\Controller\Admin\d3_LoginController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountDownloadsController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountNewsletterController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountNoticeListController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountOrderController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountPasswordController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountRecommlistController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountReviewController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountUserController_Webauthn; +use D3\Webauthn\Modules\Application\Controller\d3_AccountWishlistController_Webauthn; use D3\Webauthn\Modules\Application\Controller\d3_webauthn_OrderController; use D3\Webauthn\Modules\Application\Controller\d3_webauthn_PaymentController; use D3\Webauthn\Modules\Application\Controller\d3_webauthn_UserController; use D3\Webauthn\Modules\Application\Model\d3_User_Webauthn; use D3\Webauthn\Modules\Core\d3_webauthn_utils; use OxidEsales\Eshop\Application\Component\UserComponent; +use OxidEsales\Eshop\Application\Controller\AccountController; +use OxidEsales\Eshop\Application\Controller\AccountDownloadsController; +use OxidEsales\Eshop\Application\Controller\AccountNewsletterController; +use OxidEsales\Eshop\Application\Controller\AccountNoticeListController; +use OxidEsales\Eshop\Application\Controller\AccountOrderController; +use OxidEsales\Eshop\Application\Controller\AccountPasswordController; +use OxidEsales\Eshop\Application\Controller\AccountRecommlistController; +use OxidEsales\Eshop\Application\Controller\AccountReviewController; +use OxidEsales\Eshop\Application\Controller\AccountUserController; +use OxidEsales\Eshop\Application\Controller\AccountWishlistController; use OxidEsales\Eshop\Application\Controller\Admin\LoginController; use OxidEsales\Eshop\Application\Controller\OrderController; use OxidEsales\Eshop\Application\Controller\PaymentController; @@ -61,12 +81,23 @@ $aModule = array( 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', 'extend' => [ - UserController::class => d3_webauthn_UserController::class, - PaymentController::class => d3_webauthn_PaymentController::class, - OrderController::class => d3_webauthn_OrderController::class, - OxidModel\User::class => d3_User_Webauthn::class, - LoginController::class => d3_LoginController_Webauthn::class, - UserComponent::class => d3_webauthn_UserComponent::class, + UserController::class => d3_webauthn_UserController::class, + PaymentController::class => d3_webauthn_PaymentController::class, + OrderController::class => d3_webauthn_OrderController::class, + OxidModel\User::class => d3_User_Webauthn::class, + LoginController::class => d3_LoginController_Webauthn::class, + UserComponent::class => d3_webauthn_UserComponent::class, + + AccountController::class => d3_AccountController_Webauthn::class, + AccountDownloadsController::class => d3_AccountDownloadsController_Webauthn::class, + AccountNoticeListController::class => d3_AccountNoticeListController_Webauthn::class, + AccountWishlistController::class => d3_AccountWishlistController_Webauthn::class, + AccountRecommlistController::class => d3_AccountRecommlistController_Webauthn::class, + AccountPasswordController::class => d3_AccountPasswordController_Webauthn::class, + AccountNewsletterController::class => d3_AccountNewsletterController_Webauthn::class, + AccountUserController::class => d3_AccountUserController_Webauthn::class, + AccountOrderController::class => d3_AccountOrderController_Webauthn::class, + AccountReviewController::class => d3_AccountReviewController_Webauthn::class ], 'controllers' => [ 'd3user_webauthn' => d3user_webauthn::class, @@ -79,6 +110,7 @@ $aModule = array( 'd3webauthnlogin.tpl' => 'd3/oxwebauthn/Application/views/tpl/d3webauthnlogin.tpl', 'd3webauthnadminlogin.tpl' => 'd3/oxwebauthn/Application/views/admin/tpl/d3webauthnlogin.tpl', 'd3_account_webauthn.tpl' => 'd3/oxwebauthn/Application/views/tpl/d3_account_webauthn.tpl', + 'd3webauthnaccountlogin.tpl'=> 'd3/oxwebauthn/Application/views/tpl/d3webauthnaccountlogin.tpl', 'js_create.tpl' => 'd3/oxwebauthn/Application/views/tpl/inc/js_create.tpl', 'js_login.tpl' => 'd3/oxwebauthn/Application/views/tpl/inc/js_login.tpl',