]> git.mxchange.org Git - core.git/blobdiff - framework/main/classes/response/html/class_HtmlResponse.php
Continued:
[core.git] / framework / main / classes / response / html / class_HtmlResponse.php
index 05d5e2bee7e763c01dcd790f69ad47f57d0a497a..4150ca9d7fc156415cf8779d07153530cb307b93 100644 (file)
@@ -1,17 +1,20 @@
 <?php
 // Own namespace
-namespace CoreFramework\Response;
+namespace Org\Mxchange\CoreFramework\Response;
 
 // Import framework stuff
-use CoreFramework\Manager\ManageableApplication;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
+use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A class for an HTML response on an HTML request
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -37,47 +40,27 @@ class HtmlResponse extends BaseResponse implements Responseable {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
                // Set response type
-               $this->setResponseType('html');
+               $this->setResponseType('http');
        }
 
        /**
         * Creates an object of this class
         *
-        * @param       $applicationInstance    An instance of a manageable application
-        * @return      $responseInstance               A prepared instance of this class
+        * @return      $responseInstance       A prepared instance of this class
         */
-       public static final function createHtmlResponse (ManageableApplication $applicationInstance) {
+       public static final function createHtmlResponse () {
                // Get a new instance
                $responseInstance = new HtmlResponse();
 
-               // Set the application instance
-               $responseInstance->setApplicationInstance($applicationInstance);
-
-               // Initialize the template engine here
-               $responseInstance->initTemplateEngine($applicationInstance);
-
-               // Init web output instance
-               $responseInstance->initWebOutputInstance();
-
                // Return the prepared instance
                return $responseInstance;
        }
 
-       /**
-        * Initializes the template engine instance
-        *
-        * @param       $applicationInstance    An instance of a manageable application
-        * @return      void
-        */
-       public final function initTemplateEngine (ManageableApplication $applicationInstance) {
-               $this->setTemplateInstance($this->prepareTemplateInstance($applicationInstance));
-       }
-
        /**
         * Adds a cookie to the response
         *
@@ -88,35 +71,34 @@ class HtmlResponse extends BaseResponse implements Responseable {
         * @return      void
         * @throws      ResponseHeadersAlreadySentException             If headers are already sent
         * @todo        Encryption of cookie data not yet supported.
-        * @todo        Why are these parameters conflicting?
         * @todo        If the return statement is removed and setcookie() commented out,
         * @todo        this will send only one cookie out, the first one.
         */
-       public function addCookie ($cookieName, $cookieValue, $encrypted = FALSE, $expires = NULL) {
+       public function addCookie (string $cookieName, $cookieValue, bool $encrypted = FALSE, int $expires = NULL) {
                //* DEBUG: */ echo $cookieName.'='.$cookieValue."<br />\n";
                // Are headers already sent?
                if (headers_sent()) {
                        // Throw an exception here
                        //* DEBUG: */ return;
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-               } // END - if
+               }
 
                // Shall we encrypt the cookie?
-               if ($encrypted === TRUE) {
+               if ($encrypted) {
                        // Unsupported at the moment
                        $this->partialStub('Encryption is unsupported at the moment.');
-               } // END - if
+               }
 
                // For slow browsers set the cookie array element first
                $_COOKIE[$cookieName] = $cookieValue;
 
                // Get all config entries
                if (is_null($expires)) {
-                       $expires = (time() + $this->getConfigInstance()->getConfigEntry('cookie_expire'));
-               } // END - if
+                       $expires = (time() + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_expire'));
+               }
 
-               $path = $this->getConfigInstance()->getConfigEntry('cookie_path');
-               $domain = $this->getConfigInstance()->getConfigEntry('cookie_domain');
+               $path = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_path');
+               $domain = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_domain');
 
                setcookie($cookieName, $cookieValue, $expires);
                //, $path, $domain, (isset($_SERVER['HTTPS']))
@@ -140,17 +122,20 @@ class HtmlResponse extends BaseResponse implements Responseable {
         * @throws      ResponseHeadersAlreadySentException             If headers are already sent
         */
        public function redirectToConfiguredUrl ($configEntry) {
+               // Get application instance
+               $applicationInstance = ApplicationHelper::getSelfInstance();
+
                // Is the header not yet sent?
                if (headers_sent()) {
                        // Throw an exception here
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-               } // END - if
+               }
 
                // Assign application data
-               $this->getTemplateInstance()->assignApplicationData($this->getApplicationInstance());
+               $this->getTemplateInstance()->assignApplicationData($applicationInstance);
 
                // Get the url from config
-               $url = $this->getConfigInstance()->getConfigEntry($configEntry . '_url');
+               $url = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configEntry . '_url');
 
                // Compile the URL
                $url = $this->getTemplateInstance()->compileRawCode($url);
@@ -160,11 +145,11 @@ class HtmlResponse extends BaseResponse implements Responseable {
                        // Is there a / in front of the relative URL?
                        if (substr($url, 0, 1) == '/') {
                                $url = substr($url, 1);
-                       } // END - if
+                       }
 
                        // No, then extend it with our base URL
-                       $url = $this->getConfigInstance()->getConfigEntry('base_url') . '/' . $url;
-               } // END - if
+                       $url = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_url') . '/' . $url;
+               }
 
                // Add redirect header
                $this->addHeader('Location', str_replace('&amp;', '&', $url));
@@ -188,15 +173,15 @@ class HtmlResponse extends BaseResponse implements Responseable {
         * @param       $cookieName             Cookie to expire
         * @return      void
         */
-       public function expireCookie ($cookieName) {
+       public function expireCookie (string $cookieName) {
                // Is the cookie there?
                if (isset($_COOKIE[$cookieName])) {
                        // Then expire it with 20 minutes past
-                       $this->addCookie($cookieName, '', FALSE, (time() - 1200));
+                       $this->addCookie($cookieName, '', false, (time() - 1200));
 
                        // Remove it from array
                        unset($_COOKIE[$cookieName]);
-               } // END - if
+               }
        }
 
        /**
@@ -205,12 +190,12 @@ class HtmlResponse extends BaseResponse implements Responseable {
         * @param       $cookieName             Cookie to refresh
         * @return      void
         */
-       public function refreshCookie ($cookieName) {
+       public function refreshCookie (string $cookieName) {
                // Only update existing cookies
                if (isset($_COOKIE[$cookieName])) {
                        // Update the cookie
-                       $this->addCookie($cookieName, $_COOKIE[$cookieName], FALSE);
-               } // END - if
+                       $this->addCookie($cookieName, $_COOKIE[$cookieName], false);
+               }
        }
 
 }