aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/api.php2
-rw-r--r--include/enotify.php6
-rw-r--r--include/nav.php2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/api.php b/include/api.php
index ec3e9404a..d755c7018 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1467,7 +1467,7 @@
$server = $a->get_hostname();
$logo = $a->get_baseurl() . '/images/friendica-64.png';
$email = $a->config['admin_email'];
- $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
+ $closed = (($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
$private = (($a->config['system']['block_public']) ? 'true' : 'false');
$textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000);
if($a->config['api_import_size'])
diff --git a/include/enotify.php b/include/enotify.php
index 621f787ed..5780d1836 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -468,8 +468,8 @@ class enotify {
// generate a multipart/alternative message header
$messageHeader =
$params['additionalMailHeader'] .
- "From: {$params['fromName']} <{$params['fromEmail']}>\n" .
- "Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" .
+ "From: $fromName <{$params['fromEmail']}>\n" .
+ "Reply-To: $fromName <{$params['replyTo']}>\n" .
"MIME-Version: 1.0\n" .
"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
@@ -490,7 +490,7 @@ class enotify {
// send the message
$res = mail(
$params['toEmail'], // send to address
- $params['messageSubject'], // subject
+ $messageSubject, // subject
$multipartMessageBody, // message body
$messageHeader // message headers
);
diff --git a/include/nav.php b/include/nav.php
index 61ae16644..9ebab1320 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -104,7 +104,7 @@ EOT;
$nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
- if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
+ if(($a->config['system']['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
$nav['register'] = array('register',t('Register'), "", t('Create an account'));
$help_url = $a->get_baseurl($ssl_state) . '/help';