diff --git a/copy_this/modules/d3/d3dev/IntelliSenseHelper.php b/copy_this/modules/d3/d3dev/IntelliSenseHelper.php
index 384d771..654d793 100644
--- a/copy_this/modules/d3/d3dev/IntelliSenseHelper.php
+++ b/copy_this/modules/d3/d3dev/IntelliSenseHelper.php
@@ -14,12 +14,12 @@
* @link http://www.oxidmodule.com
*/
-class d3_dev_thankyou_parent extends thankyou {}
+class d3_dev_thankyou_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}
/**
* Class d3_dev_oxorder_parent
*/
-class d3_dev_oxorder_parent extends oxorder {}
+class d3_dev_oxorder_parent extends \OxidEsales\Eshop\Application\Model\Order {}
/**
* Class d3_dev_d3inquiry_parent
@@ -29,24 +29,24 @@ class d3_dev_d3inquiry_parent extends d3inquiry {}
/**
* Class d3_dev_oxorderarticle
*/
-class d3_dev_oxorderarticle_parent extends oxOrderArticle {}
+class d3_dev_oxorderarticle_parent extends \OxidEsales\Eshop\Application\Model\OrderArticle {}
/**
* Class d3_dev_oxemail_parent
*/
-class d3_dev_oxemail_parent extends oxemail {}
+class d3_dev_oxemail_parent extends \OxidEsales\Eshop\Core\Email {}
/**
* Class d3_dev_order_parent
*/
-class d3_dev_order_parent extends order {}
+class d3_dev_order_parent extends \OxidEsales\Eshop\Application\Controller\OrderController {}
/**
* Class d3_dev_oxbasket_parent
*/
-class d3_dev_oxbasket_parent extends oxbasket {}
+class d3_dev_oxbasket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
/**
* Class d3_dev_oxbasketitem_parent
*/
-class d3_dev_oxbasketitem_parent extends oxBasketItem {}
\ No newline at end of file
+class d3_dev_oxbasketitem_parent extends \OxidEsales\Eshop\Application\Model\BasketItem {}
diff --git a/copy_this/modules/d3/d3dev/controllers/d3dev.php b/copy_this/modules/d3/d3dev/controllers/d3dev.php
index 73e17c4..34b395f 100644
--- a/copy_this/modules/d3/d3dev/controllers/d3dev.php
+++ b/copy_this/modules/d3/d3dev/controllers/d3dev.php
@@ -1,5 +1,9 @@
getRequestParameter( 'usr' );
- $sPassword = $oConfig->getRequestParameter( 'pwd' );
+ $sUser = $request->getRequestParameter( 'usr' );
+ $sPassword = $request->getRequestParameter( 'pwd' );
if ( !$sUser || !$sPassword ) {
$sUser = $_SERVER[ 'PHP_AUTH_USER' ];
@@ -52,16 +55,16 @@ class d3dev extends oxUBase
}
}
}
- /** @var oxUser $oUser */
- $oUser = oxNew( 'oxuser' );
+ $oUser = oxNew( \OxidEsales\Eshop\Application\Model\User::class );
if ( !$sUser || !$sPassword || !$oUser->login( $sUser, $sPassword ) ) {
- $oEx = oxNew( 'oxuserexception' );
- $oEx->setMessage( 'EXCEPTION_USER_NOVALIDLOGIN' );
+ /** @var \OxidEsales\Eshop\Core\Exception\UserException $oEx */
+ $oEx = oxNew( \OxidEsales\Eshop\Core\Exception\UserException::class, 'EXCEPTION_USER_NOVALIDLOGIN' );
+
throw $oEx;
}
}
catch ( Exception $oEx ) {
- $oShop = $oConfig->getActiveShop();
+ $oShop = Registry::getConfig()->getActiveShop();
header( 'WWW-Authenticate: Basic realm="' . $oShop->oxshops__oxname->value . '"' );
header( 'HTTP/1.0 401 Unauthorized' );
exit( 1 );
@@ -70,42 +73,42 @@ class d3dev extends oxUBase
public function showOrderMailContent()
{
- header('Content-type: text/html; charset='.oxRegistry::getLang()->translateString('charset'));
-
- if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value
- || false == oxRegistry::getConfig()->getConfigParam('blD3DevShowOrderMailsInBrowser')
+ header('Content-type: text/html; charset='.Registry::getLang()->translateString('charset'));
+
+ if (Registry::getConfig()->getActiveShop()->oxshops__oxproductive->value
+ || false == Registry::getConfig()->getConfigParam('blD3DevShowOrderMailsInBrowser')
) {
- oxRegistry::getUtils()->redirect(oxRegistry::getConfig()->getShopUrl().'index.php?cl=start');
+ Registry::getUtils()->redirect(Registry::getConfig()->getShopUrl().'index.php?cl=start');
}
- $sTpl = oxRegistry::getConfig()->getRequestParameter('type');
+ $sTpl = oxNew(Request::class)->getRequestParameter('type');
/** @var d3_dev_thankyou $oThankyou */
- $oThankyou = oxNew('thankyou');
+ $oThankyou = oxNew(\OxidEsales\Eshop\Application\Controller\ThankYouController::class);
$oOrder = $oThankyou->d3GetLastOrder();
/** @var d3_dev_oxemail $oEmail */
- $oEmail = oxNew('oxemail');
+ $oEmail = oxNew(\OxidEsales\Eshop\Core\Email::class);
echo $oEmail->d3GetOrderMailContent($oOrder, $sTpl);
die();
}
public function showInquiryMailContent()
{
- if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value
- || false == oxRegistry::getConfig()->getConfigParam('blD3DevShowOrderMailsInBrowser')
+ if (Registry::getConfig()->getActiveShop()->oxshops__oxproductive->value
+ || false == Registry::getConfig()->getConfigParam('blD3DevShowOrderMailsInBrowser')
) {
- oxRegistry::getUtils()->redirect(oxRegistry::getConfig()->getShopUrl().'index.php?cl=start');
+ Registry::getUtils()->redirect(Registry::getConfig()->getShopUrl().'index.php?cl=start');
}
- $sTpl = oxRegistry::getConfig()->getRequestParameter('type');
+ $sTpl = oxNew(Request::class)->getRequestParameter('type');
/** @var d3_dev_thankyou $oThankyou */
- $oThankyou = oxNew('thankyou');
+ $oThankyou = oxNew(\OxidEsales\Eshop\Application\Controller\ThankYouController::class);
$oOrder = $oThankyou->d3GetLastInquiry();
/** @var d3_dev_oxemail $oEmail */
- $oEmail = oxNew('oxemail');
+ $oEmail = oxNew(\OxidEsales\Eshop\Core\Email::class);
echo $oEmail->d3GetInquiryMailContent($oOrder, $sTpl);
die();
}
diff --git a/copy_this/modules/d3/d3dev/metadata.php b/copy_this/modules/d3/d3dev/metadata.php
index e666fb2..ef8348a 100644
--- a/copy_this/modules/d3/d3dev/metadata.php
+++ b/copy_this/modules/d3/d3dev/metadata.php
@@ -1,4 +1,6 @@
'd3dev',
'title' =>
- (class_exists('d3utils') ? d3utils::getInstance()->getD3Logo() : 'D³') .
+ (class_exists(D3\ModCfg\Application\Model\d3utils::class) ? D3\ModCfg\Application\Model\d3utils::getInstance()->getD3Logo() : 'D³') .
' TPL Development Tool',
'description' => array(
'de' => '