Merge pull request #7388 from annando/issue-7315

[friendica.git] / src / App.php
diff --git a/src/App.php b/src/App.php

index 89d3009da04d4f72ca2afffe4e5d9d38ac24461a..8b2d50512b80b695f3b770db337e5e395e7e5791 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -8,10 +8,11 @@ use Detection\MobileDetect;
  use DOMDocument;
  use DOMXPath;
  use Exception;
-use Friendica\Core\Config\Cache\IConfigCache;
+use Friendica\Core\Config\Cache\ConfigCache;
  use Friendica\Core\Config\Configuration;
  use Friendica\Core\Hook;
  use Friendica\Core\Theme;
+use Friendica\Database\Database;
  use Friendica\Database\DBA;
  use Friendica\Model\Profile;
  use Friendica\Network\HTTPException;
@@ -122,10 +123,15 @@ class App
          */
         private $profiler;
  
+       /**
+        * @var Database The Friendica database connection
+        */
+       private $database;
+
         /**
          * Returns the current config cache of this node
          *
-        * @return IConfigCache
+        * @return ConfigCache
          */
         public function getConfigCache()
         {
@@ -193,6 +199,14 @@ class App
                 return $this->router;
         }
  
+       /**
+        * @return Database
+        */
+       public function getDatabase()
+       {
+               return $this->database;
+       }
+
         /**
          * Register a stylesheet file path to be included in the <head> tag of every page.
          * Inclusion is done in App->initHead().
@@ -232,6 +246,7 @@ class App
         /**
          * @brief App constructor.
          *
+        * @param Database $database The Friendica Database
          * @param Configuration    $config    The Configuration
          * @param App\Mode         $mode      The mode of this Friendica app
          * @param App\Router       $router    The router of this Friendica app
@@ -242,10 +257,11 @@ class App
          *
          * @throws Exception if the Basepath is not usable
          */
-       public function __construct(Configuration $config, App\Mode $mode, App\Router $router, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
+       public function __construct(Database $database, Configuration $config, App\Mode $mode, App\Router $router, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
         {
                 BaseObject::setApp($this);
  
+               $this->database = $database;
                 $this->config   = $config;
                 $this->mode     = $mode;
                 $this->router   = $router;
@@ -1032,10 +1048,11 @@ class App
                                 // Valid profile links contain a path with "/profile/" and no query parameters
                                 if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
                                         strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
-                                       if (defaults($_SESSION, "visitor_home", "") != $_GET["zrl"]) {
-                                               $_SESSION['my_url'] = $_GET['zrl'];
-                                               $_SESSION['authenticated'] = 0;
+                                       if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
+                                               Core\Session::set('my_url', $_GET['zrl']);
+                                               Core\Session::set('authenticated', 0);
                                         }
+
                                         Model\Profile::zrlInit($this);
                                 } else {
                                         // Someone came with an invalid parameter, maybe as a DDoS attempt
@@ -1060,9 +1077,9 @@ class App
                         header('X-Account-Management-Status: none');
                 }
  
-               $_SESSION['sysmsg']       = defaults($_SESSION, 'sysmsg'      , []);
-               $_SESSION['sysmsg_info']  = defaults($_SESSION, 'sysmsg_info' , []);
-               $_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
+               $_SESSION['sysmsg']       = Core\Session::get('sysmsg', []);
+               $_SESSION['sysmsg_info']  = Core\Session::get('sysmsg_info', []);
+               $_SESSION['last_updated'] = Core\Session::get('last_updated', []);
  
                 /*
                  * check_config() is responsible for running update scripts. These automatically