Merge branch '3.6-rc'

[friendica-addons.git] / mailstream / mailstream.php

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 18d0420d2776f178b6282f0655b68dfd8fc9f8e3..50f820e7e2d09948df9415dccbf30744031a6667 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -5,11 +5,14 @@
  * Version: 1.1
  * Author: Matthew Exon <http://mat.exon.name>
  */
+
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
+use Friendica\Util\Network;
 
 function mailstream_install() {
        Addon::registerHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
@@ -18,37 +21,37 @@ function mailstream_install() {
        Addon::registerHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
        Addon::registerHook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
 
-       if (Config::get('mailstream', 'dbversion') == '0.1') {
+       if (get_config('mailstream', 'dbversion') == '0.1') {
                q('ALTER TABLE `mailstream_item` DROP INDEX `uid`');
                q('ALTER TABLE `mailstream_item` DROP INDEX `contact-id`');
                q('ALTER TABLE `mailstream_item` DROP INDEX `plink`');
                q('ALTER TABLE `mailstream_item` CHANGE `plink` `uri` char(255) NOT NULL');
-               Config::set('mailstream', 'dbversion', '0.2');
+               set_config('mailstream', 'dbversion', '0.2');
        }
-       if (Config::get('mailstream', 'dbversion') == '0.2') {
+       if (get_config('mailstream', 'dbversion') == '0.2') {
                q('DELETE FROM `pconfig` WHERE `cat` = "mailstream" AND `k` = "delay"');
-               Config::set('mailstream', 'dbversion', '0.3');
+               set_config('mailstream', 'dbversion', '0.3');
        }
-       if (Config::get('mailstream', 'dbversion') == '0.3') {
+       if (get_config('mailstream', 'dbversion') == '0.3') {
                q('ALTER TABLE `mailstream_item` CHANGE `created` `created` timestamp NOT NULL DEFAULT now()');
                q('ALTER TABLE `mailstream_item` CHANGE `completed` `completed` timestamp NULL DEFAULT NULL');
-               Config::set('mailstream', 'dbversion', '0.4');
+               set_config('mailstream', 'dbversion', '0.4');
        }
-       if (Config::get('mailstream', 'dbversion') == '0.4') {
+       if (get_config('mailstream', 'dbversion') == '0.4') {
                q('ALTER TABLE `mailstream_item` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin');
-               Config::set('mailstream', 'dbversion', '0.5');
+               set_config('mailstream', 'dbversion', '0.5');
        }
-       if (Config::get('mailstream', 'dbversion') == '0.5') {
-               Config::set('mailstream', 'dbversion', '1.0');
+       if (get_config('mailstream', 'dbversion') == '0.5') {
+               set_config('mailstream', 'dbversion', '1.0');
        }
 
-       if (Config::get('retriever', 'dbversion') != '1.0') {
+       if (get_config('retriever', 'dbversion') != '1.0') {
                $schema = file_get_contents(dirname(__file__).'/database.sql');
                $arr = explode(';', $schema);
                foreach ($arr as $a) {
                        $r = q($a);
                }
-               Config::set('mailstream', 'dbversion', '1.0');
+               set_config('mailstream', 'dbversion', '1.0');
        }
 }
 
@@ -81,7 +84,7 @@ function mailstream_addon_admin(&$a,&$o) {
 
 function mailstream_addon_admin_post ($a) {
        if (x($_POST, 'frommail')) {
-               Config::set('mailstream', 'frommail', $_POST['frommail']);
+               set_config('mailstream', 'frommail', $_POST['frommail']);
        }
 }
 
@@ -95,7 +98,7 @@ function mailstream_generate_id($a, $uri) {
 }
 
 function mailstream_post_hook(&$a, &$item) {
-       if (!PConfig::get($item['uid'], 'mailstream', 'enabled')) {
+       if (!get_pconfig($item['uid'], 'mailstream', 'enabled')) {
                return;
        }
        if (!$item['uid']) {
@@ -107,7 +110,7 @@ function mailstream_post_hook(&$a, &$item) {
        if (!$item['uri']) {
                return;
        }
-       if (PConfig::get($item['uid'], 'mailstream', 'nolikes')) {
+       if (get_pconfig($item['uid'], 'mailstream', 'nolikes')) {
                if ($item['verb'] == ACTIVITY_LIKE) {
                        return;
                }
@@ -144,10 +147,10 @@ function mailstream_get_user($uid) {
 }
 
 function mailstream_do_images($a, &$item, &$attachments) {
-       if (!PConfig::get($item['uid'], 'mailstream', 'attachimg')) {
+       if (!get_pconfig($item['uid'], 'mailstream', 'attachimg')) {
                return;
        }
-       $attachments = [];
+       $attachments = array();
        $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);
@@ -155,10 +158,10 @@ function mailstream_do_images($a, &$item, &$attachments) {
                $redirects;
                $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
                $attachments[$url] = [
-                       'data' => fetch_url($url, true, $redirects, 0, Null, $cookiejar),
+                       'data' => Network::fetchUrl($url, true, $redirects, 0, null, $cookiejar),
                        'guid' => hash("crc32", $url),
                        'filename' => basename($url),
-                       'type' => $a->get_curl_content_type()];
+                       'type' => $a->get_curl_content_type());
                if (strlen($attachments[$url]['data'])) {
                        $item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']);
                        continue;
@@ -169,7 +172,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
 
 function mailstream_sender($item) {
        $r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']);
-       if (DBM::is_result($r)) {
+       if (dbm::is_result($r)) {
                $contact = $r[0];
                if ($contact['name'] != $item['author-name']) {
                        return $contact['name'] . ' - ' . $item['author-name'];
@@ -179,7 +182,7 @@ function mailstream_sender($item) {
 }
 
 function mailstream_decode_subject($subject) {
-       $html = bbcode($subject);
+       $html = BBCode::convert($subject);
        if (!$html) {
                return $subject;
        }
@@ -210,7 +213,7 @@ function mailstream_subject($item) {
        // Don't look more than 100 levels deep for a subject, in case of loops
        for ($i = 0; ($i < 100) && $parent; $i++) {
                $r = q("SELECT `thr-parent`, `title` FROM `item` WHERE `uri` = '%s'", dbesc($parent));
-               if (!DBM::is_result($r)) {
+               if (!dbm::is_result($r)) {
                        break;
                }
                if ($r[0]['thr-parent'] === $parent) {
@@ -254,14 +257,14 @@ function mailstream_send($a, $message_id, $item, $user) {
                return;
        }
        require_once(dirname(__file__).'/phpmailer/class.phpmailer.php');
-       require_once('include/bbcode.php');
+
        $attachments = [];
        mailstream_do_images($a, $item, $attachments);
-       $frommail = Config::get('mailstream', 'frommail');
+       $frommail = get_config('mailstream', 'frommail');
        if ($frommail == "") {
                $frommail = 'friendica@localhost.local';
        }
-       $address = PConfig::get($item['uid'], 'mailstream', 'address');
+       $address = get_pconfig($item['uid'], 'mailstream', 'address');
        if (!$address) {
                $address = $user['email'];
        }
@@ -284,7 +287,7 @@ function mailstream_send($a, $message_id, $item, $user) {
                $mail->IsHTML(true);
                $mail->CharSet = 'utf-8';
                $template = get_markup_template('mail.tpl', 'addon/mailstream/');
-               $item['body'] = bbcode($item['body']);
+               $item['body'] = BBCode::convert($item['body']);
                $item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id'];
                $mail->Body = replace_macros($template, [
                                                 '$upstream' => L10n::t('Upstream'),
@@ -353,8 +356,8 @@ function mailstream_addon_settings(&$a,&$s) {
        $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, [
-                                '$enabled' => [
+       $s .= replace_macros($template, array(
+                                '$enabled' => array(
                                        'mailstream_enabled',
                                        L10n::t('Enabled'),
                                        $enabled],
@@ -379,28 +382,28 @@ function mailstream_addon_settings(&$a,&$s) {
 
 function mailstream_addon_settings_post($a,$post) {
        if ($_POST['mailstream_address'] != "") {
-               PConfig::set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
+               set_pconfig(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
        }
        else {
-               PConfig::delete(local_user(), 'mailstream', 'address');
+               del_pconfig(local_user(), 'mailstream', 'address');
        }
        if ($_POST['mailstream_nolikes']) {
-               PConfig::set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
+               set_pconfig(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
        }
        else {
-               PConfig::delete(local_user(), 'mailstream', 'nolikes');
+               del_pconfig(local_user(), 'mailstream', 'nolikes');
        }
        if ($_POST['mailstream_enabled']) {
-               PConfig::set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
+               set_pconfig(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
        }
        else {
-               PConfig::delete(local_user(), 'mailstream', 'enabled');
+               del_pconfig(local_user(), 'mailstream', 'enabled');
        }
        if ($_POST['mailstream_attachimg']) {
-               PConfig::set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
+               set_pconfig(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
        }
        else {
-               PConfig::delete(local_user(), 'mailstream', 'attachimg');
+               del_pconfig(local_user(), 'mailstream', 'attachimg');
        }
 }