Fix null value passed to string functions deprecation notices

[friendica.git] / src / Module / Admin / Site.php

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 011e3c411de975c162340c445cf3e5397821ef24..ab6624f776b2912ae2ba9ff4a7a236f11bbfea18 100644 (file)
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -38,8 +38,6 @@ use Friendica\Protocol\Relay;
 use Friendica\Util\BasePath;
 use Friendica\Util\EMailer\MailBuilder;
 
-require_once __DIR__ . '/../../../boot.php';
-
 class Site extends BaseAdmin
 {
        protected function post(array $request = [])
@@ -100,6 +98,7 @@ class Site extends BaseAdmin
                $enable_multi_reg       = !empty($_POST['enable_multi_reg']);
                $enable_openid          = !empty($_POST['enable_openid']);
                $enable_regfullname     = !empty($_POST['enable_regfullname']);
+               $register_notification  = !empty($_POST['register_notification']);
                $community_page_style   = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0);
                $max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0);
 
@@ -268,6 +267,7 @@ class Site extends BaseAdmin
                DI::config()->set('system', 'block_extended_register', !$enable_multi_reg);
                DI::config()->set('system', 'no_openid'              , !$enable_openid);
                DI::config()->set('system', 'no_regfullname'         , !$enable_regfullname);
+               DI::config()->set('system', 'register_notification'  , $register_notification);
                DI::config()->set('system', 'community_page_style'   , $community_page_style);
                DI::config()->set('system', 'max_author_posts_community_page', $max_author_posts_community_page);
                DI::config()->set('system', 'verifyssl'              , $verifyssl);
@@ -324,8 +324,8 @@ class Site extends BaseAdmin
                /* Installed langs */
                $lang_choices = DI::l10n()->getAvailableLanguages();
 
-               if (strlen(DI::config()->get('system', 'directory_submit_url')) &&
-                       !strlen(DI::config()->get('system', 'directory'))) {
+               if (DI::config()->get('system', 'directory_submit_url') &&
+                       !DI::config()->get('system', 'directory')) {
                        DI::config()->set('system', 'directory', dirname(DI::config()->get('system', 'directory_submit_url')));
                        DI::config()->delete('system', 'directory_submit_url');
                }
@@ -467,7 +467,7 @@ class Site extends BaseAdmin
                        '$show_help'        => ['show_help', DI::l10n()->t('Show help entry from navigation menu'), !DI::config()->get('system', 'hide_help'), DI::l10n()->t('Displays the menu entry for the Help pages from the navigation menu. It is always accessible by calling /help directly.')],
                        '$singleuser'       => ['singleuser', DI::l10n()->t('Single user instance'), DI::config()->get('system', 'singleuser', '---'), DI::l10n()->t('Make this instance multi-user or single-user for the named user'), $user_names],
 
-                       '$maximagesize'     => ['maximagesize', DI::l10n()->t('Maximum image size'), DI::config()->get('system', 'maximagesize'), DI::l10n()->t('Maximum size in bytes of uploaded images. Default is 0, which means no limits.')],
+                       '$maximagesize'     => ['maximagesize', DI::l10n()->t('Maximum image size'), DI::config()->get('system', 'maximagesize'), DI::l10n()->t('Maximum size in bytes of uploaded images. Default is 0, which means no limits. Be aware that this setting does not affect server-side upload limits.')],
                        '$maximagelength'   => ['maximagelength', DI::l10n()->t('Maximum image length'), DI::config()->get('system', 'max_image_length'), DI::l10n()->t('Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.')],
                        '$jpegimagequality' => ['jpegimagequality', DI::l10n()->t('JPEG image quality'), DI::config()->get('system', 'jpeg_quality'), DI::l10n()->t('Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.')],
 
@@ -494,6 +494,7 @@ class Site extends BaseAdmin
                        '$enable_multi_reg'       => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')],
                        '$enable_openid'          => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')],
                        '$enable_regfullname'     => ['enable_regfullname', DI::l10n()->t('Enable Fullname check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Enable check to only allow users to register with a space between the first name and the last name in their full name.')],
+                       '$register_notification'  => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')],
                        '$community_page_style'   => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices],
                        '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')],
                        '$mail_able'              => function_exists('imap_open'),