X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailstream%2Fmailstream.php;h=4f86e7045bbc84c4d8c741d8b743333df981711a;hb=a3ad6e42e04fe79b37fc043743fe47ce99f81bf7;hp=012416b81d1499871fac8cd57ecc2871e20c2297;hpb=d9ec1ef80d4a27f9e5b4e24a9be1c3ed1e60d116;p=friendica-addons.git

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 012416b8..4f86e704 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -7,20 +7,22 @@
  */
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
 use Friendica\Model\Item;
 
 function mailstream_install() {
-	Addon::registerHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
-	Addon::registerHook('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
-	Addon::registerHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Addon::registerHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Addon::registerHook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
+	Hook::register('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
+	Hook::register('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
+	Hook::register('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
+	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
+	Hook::register('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
 
 	if (Config::get('mailstream', 'dbversion') == '0.1') {
 		q('ALTER TABLE `mailstream_item` DROP INDEX `uid`');
@@ -57,44 +59,44 @@ function mailstream_install() {
 }
 
 function mailstream_uninstall() {
-	Addon::unregisterHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
-	Addon::unregisterHook('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
-	Addon::unregisterHook('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
-	Addon::unregisterHook('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
-	Addon::unregisterHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
-	Addon::unregisterHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
-	Addon::unregisterHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Addon::unregisterHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Addon::unregisterHook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
-	Addon::unregisterHook('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail');
+	Hook::unregister('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
+	Hook::unregister('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
+	Hook::unregister('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
+	Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
+	Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
+	Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
+	Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
+	Hook::unregister('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
+	Hook::unregister('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail');
 }
 
 function mailstream_module() {}
 
 function mailstream_addon_admin(&$a,&$o) {
 	$frommail = Config::get('mailstream', 'frommail');
-	$template = get_markup_template('admin.tpl', 'addon/mailstream/');
+	$template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
 	$config = ['frommail',
 			L10n::t('From Address'),
 			$frommail,
 			L10n::t('Email address that stream items will appear to be from.')];
-	$o .= replace_macros($template, [
+	$o .= Renderer::replaceMacros($template, [
 				 '$frommail' => $config,
 				 '$submit' => L10n::t('Save Settings')]);
 }
 
 function mailstream_addon_admin_post ($a) {
-	if (x($_POST, 'frommail')) {
+	if (!empty($_POST['frommail'])) {
 		Config::set('mailstream', 'frommail', $_POST['frommail']);
 	}
 }
 
 function mailstream_generate_id($a, $uri) {
 	// http://www.jwz.org/doc/mid.html
-	$host = $a->get_hostname();
+	$host = $a->getHostName();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
-	logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG);
+	Logger::log('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, Logger::DEBUG);
 	return $message_id;
 }
 
@@ -120,19 +122,19 @@ function mailstream_post_hook(&$a, &$item) {
 	$message_id = mailstream_generate_id($a, $item['uri']);
 	q("INSERT INTO `mailstream_item` (`uid`, `contact-id`, `uri`, `message-id`) " .
 		"VALUES (%d, '%s', '%s', '%s')", intval($item['uid']),
-		intval($item['contact-id']), dbesc($item['uri']), dbesc($message_id));
-	$r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), dbesc($item['uri']));
+		intval($item['contact-id']), DBA::escape($item['uri']), DBA::escape($message_id));
+	$r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), DBA::escape($item['uri']));
 	if (count($r) != 1) {
-		logger('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', LOGGER_NORMAL);
+		Logger::log('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', Logger::INFO);
 		return;
 	}
 	$ms_item = $r[0];
-	logger('mailstream_post_remote_hook: created mailstream_item '
+	Logger::log('mailstream_post_remote_hook: created mailstream_item '
 		. $ms_item['id'] . ' for item ' . $item['uri'] . ' '
-		. $item['uid'] . ' ' . $item['contact-id'], LOGGER_DATA);
+		. $item['uid'] . ' ' . $item['contact-id'], Logger::DATA);
 	$user = mailstream_get_user($item['uid']);
 	if (!$user) {
-		logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_NORMAL);
+		Logger::log('mailstream_post_remote_hook: no user ' . $item['uid'], Logger::INFO);
 		return;
 	}
 	mailstream_send($a, $ms_item['message-id'], $item, $user);
@@ -141,7 +143,7 @@ function mailstream_post_hook(&$a, &$item) {
 function mailstream_get_user($uid) {
 	$r = q('SELECT * FROM `user` WHERE `uid` = %d', intval($uid));
 	if (count($r) != 1) {
-		logger('mailstream_post_remote_hook: Unexpected number of users returned', LOGGER_NORMAL);
+		Logger::log('mailstream_post_remote_hook: Unexpected number of users returned', Logger::INFO);
 		return;
 	}
 	return $r[0];
@@ -152,17 +154,19 @@ function mailstream_do_images($a, &$item, &$attachments) {
 		return;
 	}
 	$attachments = [];
-	$baseurl = $a->get_baseurl();
 	preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
 	preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
 	foreach (array_merge($matches1[3], $matches2[1]) as $url) {
-		$redirects;
+		$redirects = 0;
 		$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
+		$curlResult = Network::fetchUrlFull($url, true, $redirects, 0, null, $cookiejar);
 		$attachments[$url] = [
-			'data' => Network::fetchUrl($url, true, $redirects, 0, null, $cookiejar),
+			'data' => $curlResult->getBody(),
 			'guid' => hash("crc32", $url),
 			'filename' => basename($url),
-			'type' => $a->get_curl_content_type()];
+			'type' => $curlResult->getContentType()
+		];
+
 		if (strlen($attachments[$url]['data'])) {
 			$item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']);
 			continue;
@@ -287,10 +291,10 @@ function mailstream_send($a, $message_id, $item, $user) {
 		}
 		$mail->IsHTML(true);
 		$mail->CharSet = 'utf-8';
-		$template = get_markup_template('mail.tpl', 'addon/mailstream/');
+		$template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/');
 		$item['body'] = BBCode::convert($item['body']);
-		$item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id'];
-		$mail->Body = replace_macros($template, [
+		$item['url'] = $a->getBaseURL() . '/display/' . $user['nickname'] . '/' . $item['id'];
+		$mail->Body = Renderer::replaceMacros($template, [
 						 '$upstream' => L10n::t('Upstream'),
 						 '$local' => L10n::t('Local'),
 						 '$item' => $item]);
@@ -298,16 +302,16 @@ function mailstream_send($a, $message_id, $item, $user) {
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		logger('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject, LOGGER_DEBUG);
+		Logger::log('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject, Logger::DEBUG);
 	} catch (phpmailerException $e) {
-		logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_NORMAL);
+		Logger::log('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), Logger::INFO);
 	} catch (Exception $e) {
-		logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_NORMAL);
+		Logger::log('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), Logger::INFO);
 	}
 	// In case of failure, still set the item to completed.  Otherwise
 	// we'll just try to send it over and over again and it'll fail
 	// every time.
-	q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', dbesc($message_id));
+	q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', DBA::escape($message_id));
 }
 
 /**
@@ -331,10 +335,10 @@ function mailstream_cron($a, $b) {
 	// mailstream_post_remote_hook fails for some reason will this get
 	// used, and in that case it's worth holding off a bit anyway.
 	$ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
-	logger('mailstream_cron processing ' . count($ms_item_ids) . ' items', LOGGER_DEBUG);
+	Logger::log('mailstream_cron processing ' . count($ms_item_ids) . ' items', Logger::DEBUG);
 	foreach ($ms_item_ids as $ms_item_id) {
 		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_NORMAL);
+			Logger::log('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', Logger::INFO);
 		}
 		$item = Item::selectFirst([], ['id' => $ms_item_id['id']]);
 		$users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid']));
@@ -343,7 +347,7 @@ function mailstream_cron($a, $b) {
 			mailstream_send($a, $ms_item_id['message-id'], $item, $user);
 		}
 		else {
-			logger('mailstream_cron: Unable to find item ' . $ms_item_id['id'], LOGGER_NORMAL);
+			Logger::log('mailstream_cron: Unable to find item ' . $ms_item_id['id'], Logger::INFO);
 			q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id']));
 		}
 	}
@@ -355,8 +359,8 @@ function mailstream_addon_settings(&$a,&$s) {
 	$address = PConfig::get(local_user(), 'mailstream', 'address');
 	$nolikes = PConfig::get(local_user(), 'mailstream', 'nolikes');
 	$attachimg= PConfig::get(local_user(), 'mailstream', 'attachimg');
-	$template = get_markup_template('settings.tpl', 'addon/mailstream/');
-	$s .= replace_macros($template, [
+	$template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/');
+	$s .= Renderer::replaceMacros($template, [
 				 '$enabled' => [
 					'mailstream_enabled',
 					L10n::t('Enabled'),
@@ -412,5 +416,5 @@ function mailstream_tidy() {
 	foreach ($r as $rr) {
 		q('DELETE FROM mailstream_item WHERE id = %d', intval($rr['id']));
 	}
-	logger('mailstream_tidy: deleted ' . count($r) . ' old items', LOGGER_DEBUG);
+	Logger::log('mailstream_tidy: deleted ' . count($r) . ' old items', Logger::DEBUG);
 }