Codeoptimierung

src/Modules/Application/Controller/Admin/OrderOverview.php

@@ -24,7 +24,7 @@ class OrderOverview extends OrderOverview_parent
                     $oOrder->save();
                 }
 
-                $oUtils = \OxidEsales\Eshop\Core\Registry::getUtils();
+                $oUtils = Registry::getUtils();
                 $sTrimmedBillName = trim($oOrder->oxorder__oxbilllname->getRawValue());
                 if(!$sTrimmedBillName) {
                     return FALSE;
@@ -38,8 +38,8 @@ class OrderOverview extends OrderOverview_parent
                 }
                 $sFilename = $oOrder->oxorder__oxordernr->value . "_" . $sTrimmedBillName . ".xml";
                 $sFilename = $this->makeValidFileName($sFilename);
-                ob_start();
-                $oOrder->genXRechnung($sFilename, \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("xmllanguage"), false);
+                $aReturn =  $oOrder->genXRechnung($sFilename, Registry::getConfig()->getRequestParameter("xmllanguage"), false);
+                $sFilename = $aReturn['FileName'];
 
                 $myConfig = Registry::getConfig();
 
@@ -48,7 +48,7 @@ class OrderOverview extends OrderOverview_parent
                 {
                     $sExportFolder = $myConfig->getConfigParam("d3xrechnung_EXPORT_FOLDER");
                 }
-
+                ob_start();
                 echo file_get_contents($myConfig->getConfigParam('sShopDir')."/".$sExportFolder."/".$sFilename);
                 $sXML = ob_get_contents();
                 ob_end_clean();
@@ -57,7 +57,7 @@ class OrderOverview extends OrderOverview_parent
                 $oUtils->setHeader("Expires: 0");
                 $oUtils->setHeader("Content-type: application/xml");
                 $oUtils->setHeader("Content-Disposition: attachment; filename=" . $sFilename);
-                \OxidEsales\Eshop\Core\Registry::getUtils()->showMessageAndExit($sXML);
+                Registry::getUtils()->showMessageAndExit($sXML);
             }
         }
     }

src/Modules/Application/Model/Order.php

@@ -56,20 +56,18 @@ class Order extends Order_parent
 
         $sUser = $oConfig->getConfigParam('d3xrechnung_HTACCESS_USER');
         $sPassword = $oConfig->getConfigParam('d3xrechnung_HTACCESS_PASSWORD');
-
+        $auth = [$sUser, $sPassword]
+;
         $client = new Client();
         try {
             $response = $client->request('GET', $sPathDetails,
                 [
-                    'auth' => [$sUser, $sPassword],
+                    'auth' => $auth,
                     'query' => $query
                 ]
             );
-
-            if($saveContent) {
-                return $response->getBody();
-            }
-            return true;
+            $body = $response->getBody();
+            return $body->getContents();
         }
         catch (ClientException $exception) {
             $logger = Registry::getLogger();