X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=notifyall%2Fnotifyall.php;h=58e54908c87c887b5c9175887574ea12837aebfd;hb=a2d956b240f4c4bda300c4d91dd4869bfc88b2c9;hp=5ea0db38c614749007d33a81d8254a16713d6642;hpb=91fd77af3b2cff61ad474f52a13e733cd696098e;p=friendica-addons.git%2F.git

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 5ea0db38..58e54908 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -8,45 +8,58 @@
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
  */
 
+use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Util\Emailer;
 
-function notifyall_install() {
-	logger("installed notifyall");
+function notifyall_install()
+{
+	Logger::log("installed notifyall");
 }
 
-function notifyall_uninstall() {
-	logger("removed notifyall");
+function notifyall_uninstall()
+{
+	Logger::log("removed notifyall");
 }
 
 function notifyall_module() {}
 
-function notifyall_addon_admin(&$a, &$o) {
-
-	$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . z_root() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
+function notifyall_addon_admin(App $a, &$o)
+{
+	$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . $a->getBaseURL() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
 }
 
 
-function notifyall_post(&$a) {
-	if(! is_site_admin())
+function notifyall_post(App $a)
+{
+	if(!is_site_admin()) {
 		return;
+	}
 
 	$text = trim($_REQUEST['text']);
-	if(! $text)
+
+	if(! $text) {
 		return;
+	}
 
-	$sitename = $a->config['sitename'];
+	$sitename = Config::get('config', 'sitename');
 
-	if (!x($a->config['admin_name']))
-		$sender_name = L10n::t('%s Administrator', $sitename);
-	else
-		$sender_name = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename);
+	if (empty(Config::get('config', 'admin_name'))) {
+		$sender_name = '"' . L10n::t('%s Administrator', $sitename) . '"';
+	} else {
+		$sender_name = '"' . L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename) . '"';
+	}
 
-	if (! x($a->config['sender_email']))
-		$sender_email = 'noreply@' . $a->get_hostname();
-	else
-		$sender_email = $a->config['sender_email'];
+	if (!Config::get('config', 'sender_email')) {
+		$sender_email = 'noreply@' . $a->getHostName();
+	} else {
+		$sender_email = Config::get('config', 'sender_email');
+	}
 
 	$subject = $_REQUEST['subject'];
 
@@ -58,7 +71,7 @@ function notifyall_post(&$a) {
 	// if this is a test, send it only to the admin(s)
 	// admin_email might be a comma separated list, but we need "a@b','c@d','e@f
 	if (intval($_REQUEST['test'])) {
-		$email = $a->config['admin_email'];
+		$email = Config::get('config', 'admin_email');
 		$email = "'" . str_replace([" ",","], ["","','"], $email) . "'";
 	}
 	$sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` in ( %s )", $email) : '');
@@ -83,7 +96,7 @@ function notifyall_post(&$a) {
 	}
 
 	notice(L10n::t('Emails sent'));
-	goaway('admin');
+	$a->internalRedirect('admin');
 }
 
 function notifyall_content(&$a)
@@ -94,10 +107,10 @@ function notifyall_content(&$a)
 
 	$title = L10n::t('Send email to all members of this Friendica instance.');
 
-	$o = replace_macros(get_markup_template('notifyall_form.tpl', 'addon/notifyall/'), [
+	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('notifyall_form.tpl', 'addon/notifyall/'), [
 		'$title' => $title,
-		'$text' => htmlspecialchars($_REQUEST['text']),
-		'$subject' => ['subject',L10n::t('Message subject'),$_REQUEST['subject'],''],
+		'$text' => htmlspecialchars(defaults($_REQUEST, 'text', '')),
+		'$subject' => ['subject', L10n::t('Message subject'), defaults($_REQUEST, 'subject', ''),''],
 		'$test' => ['test',L10n::t('Test mode (only send to administrator)'), 0,''],
 		'$submit' => L10n::t('Submit')
 	]);