Merge pull request #8946 from annando/fix-fatal

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index ceb11dd797ecdb567691e59208d82343d54626da..65ae3fe2f47389583dc0286733f1d4a2c528b990 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/App.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica;
 
 use Exception;
@@ -25,9 +42,6 @@ use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 
 /**
- *
- * class: App
- *
  * Our main application structure for the life of this page.
  *
  * Primarily deals with the URL that got us here
@@ -226,43 +240,6 @@ class App
                }
        }
 
-       /**
-        * Returns the current UserAgent as a String
-        *
-        * @return string the UserAgent as a String
-        * @throws HTTPException\InternalServerErrorException
-        */
-       public function getUserAgent()
-       {
-               return
-                       FRIENDICA_PLATFORM . " '" .
-                       FRIENDICA_CODENAME . "' " .
-                       FRIENDICA_VERSION . '-' .
-                       DB_UPDATE_VERSION . '; ' .
-                       $this->baseURL->get();
-       }
-
-       /**
-        * Generates the site's default sender email address
-        *
-        * @return string
-        * @throws HTTPException\InternalServerErrorException
-        */
-       public function getSenderEmailAddress()
-       {
-               $sender_email = $this->config->get('config', 'sender_email');
-               if (empty($sender_email)) {
-                       $hostname = $this->baseURL->getHostname();
-                       if (strpos($hostname, ':')) {
-                               $hostname = substr($hostname, 0, strpos($hostname, ':'));
-                       }
-
-                       $sender_email = 'noreply@' . $hostname;
-               }
-
-               return $sender_email;
-       }
-
        /**
         * Returns the current theme name. May be overriden by the mobile theme name.
         *