X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=1d24dbcfc7db137ae7f4c3088254c033cee11891;hb=4914afa2219e433115dac79bcc4ce0b3b1c92a28;hp=d8d2431f1152d68343a4678839216892b648794d;hpb=bbaf463a204f84d0ac05336925abf99ae3583b8e;p=friendica-addons.git

diff --git a/wppost/wppost.php b/wppost/wppost.php
index d8d2431f..1d24dbcf 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -9,12 +9,10 @@
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\Network;
-use Friendica\Util\Strings;
+use Friendica\Model\Post;
 use Friendica\Util\XML;
 
 function wppost_install()
@@ -27,22 +25,6 @@ function wppost_install()
 	Hook::register('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
 }
 
-function wppost_uninstall()
-{
-	Hook::unregister('hook_fork',        'addon/wppost/wppost.php', 'wppost_hook_fork');
-	Hook::unregister('post_local',       'addon/wppost/wppost.php', 'wppost_post_local');
-	Hook::unregister('notifier_normal',  'addon/wppost/wppost.php', 'wppost_send');
-	Hook::unregister('jot_networks',     'addon/wppost/wppost.php', 'wppost_jot_nets');
-	Hook::unregister('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
-	Hook::unregister('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
-
-	// obsolete - remove
-	Hook::unregister('post_local_end',   'addon/wppost/wppost.php', 'wppost_send');
-	Hook::unregister('addon_settings',  'addon/wppost/wppost.php', 'wppost_settings');
-	Hook::unregister('addon_settings_post',  'addon/wppost/wppost.php', 'wppost_settings_post');
-}
-
-
 function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 {
 	if (!local_user()) {
@@ -54,7 +36,7 @@ function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 			'type' => 'checkbox',
 			'field' => [
 				'wppost_enable',
-				L10n::t('Post to Wordpress'),
+				DI::l10n()->t('Post to Wordpress'),
 				DI::pConfig()->get(local_user(),'wppost','post_by_default')
 			]
 		];
@@ -62,7 +44,7 @@ function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 }
 
 
-function wppost_settings(&$a,&$s) {
+function wppost_settings(&$a, &$s) {
 
 	if(! local_user())
 		return;
@@ -95,74 +77,76 @@ function wppost_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. L10n::t('Wordpress Export').'</h3>';
+    $s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. DI::l10n()->t('Wordpress Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. L10n::t('Wordpress Export').'</h3>';
+    $s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. DI::l10n()->t('Wordpress Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
-    $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . L10n::t('Enable WordPress Post Addon') . '</label>';
-    $s .= '<input id="wppost-checkbox" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
+    $s .= '<label id="wppost-enable-label" for="wppost-enable">' . DI::l10n()->t('Enable WordPress Post Addon') . '</label>';
+	$s .= '<input type="hidden" name="wppost" value="0"/>';
+    $s .= '<input id="wppost-enable" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-username-wrapper">';
-    $s .= '<label id="wppost-username-label" for="wppost-username">' . L10n::t('WordPress username') . '</label>';
+    $s .= '<label id="wppost-username-label" for="wppost-username">' . DI::l10n()->t('WordPress username') . '</label>';
     $s .= '<input id="wppost-username" type="text" name="wp_username" value="' . $wp_username . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-password-wrapper">';
-    $s .= '<label id="wppost-password-label" for="wppost-password">' . L10n::t('WordPress password') . '</label>';
+    $s .= '<label id="wppost-password-label" for="wppost-password">' . DI::l10n()->t('WordPress password') . '</label>';
     $s .= '<input id="wppost-password" type="password" name="wp_password" value="' . $wp_password . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-blog-wrapper">';
-    $s .= '<label id="wppost-blog-label" for="wppost-blog">' . L10n::t('WordPress API URL') . '</label>';
+    $s .= '<label id="wppost-blog-label" for="wppost-blog">' . DI::l10n()->t('WordPress API URL') . '</label>';
     $s .= '<input id="wppost-blog" type="text" name="wp_blog" value="' . $wp_blog . '" />';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-bydefault-wrapper">';
-    $s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . L10n::t('Post to WordPress by default') . '</label>';
+    $s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . DI::l10n()->t('Post to WordPress by default') . '</label>';
+	$s .= '<input type="hidden" name="wp_bydefault" value="0"/>';
     $s .= '<input id="wppost-bydefault" type="checkbox" name="wp_bydefault" value="1" ' . $def_checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-backlink-wrapper">';
-    $s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . L10n::t('Provide a backlink to the Friendica post') . '</label>';
+    $s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . DI::l10n()->t('Provide a backlink to the Friendica post') . '</label>';
+	$s .= '<input type="hidden" name="wp_backlink" value="0"/>';
     $s .= '<input id="wppost-backlink" type="checkbox" name="wp_backlink" value="1" ' . $back_checked . '/>';
     $s .= '</div><div class="clear"></div>';
     $s .= '<div id="wppost-backlinktext-wrapper">';
-    $s .= '<label id="wppost-backlinktext-label" for="wp_backlink_text">' . L10n::t('Text for the backlink, e.g. Read the original post and comment stream on Friendica.') . '</label>';
+    $s .= '<label id="wppost-backlinktext-label" for="wp_backlink_text">' . DI::l10n()->t('Text for the backlink, e.g. Read the original post and comment stream on Friendica.') . '</label>';
     $s .= '<input id="wppost-backlinktext" type="text" name="wp_backlink_text" value="'. $wp_backlink_text.'" ' . $wp_backlink_text . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-shortcheck-wrapper">';
-    $s .= '<label id="wppost-shortcheck-label" for="wppost-shortcheck">' . L10n::t("Don't post messages that are too short") . '</label>';
+    $s .= '<label id="wppost-shortcheck-label" for="wppost-shortcheck">' . DI::l10n()->t("Don't post messages that are too short") . '</label>';
+    $s .= '<input type="hidden" name="wp_shortcheck" value="0"/>';
     $s .= '<input id="wppost-shortcheck" type="checkbox" name="wp_shortcheck" value="1" '.$shortcheck_checked.'/>';
     $s .= '</div><div class="clear"></div>';
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 
 }
 
 
-function wppost_settings_post(&$a,&$b) {
-
+function wppost_settings_post(&$a, &$b)
+{
 	if(!empty($_POST['wppost-submit'])) {
-		DI::pConfig()->set(local_user(),'wppost','post',intval($_POST['wppost']));
-		DI::pConfig()->set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault'] ?? false));
-		DI::pConfig()->set(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
-		DI::pConfig()->set(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
-		DI::pConfig()->set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
-		DI::pConfig()->set(local_user(),'wppost','backlink',trim($_POST['wp_backlink'] ?? ''));
-		DI::pConfig()->set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
-		$wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text']));
-		$wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8);
+		DI::pConfig()->set(local_user(), 'wppost', 'post'           , intval($_POST['wppost']));
+		DI::pConfig()->set(local_user(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
+		DI::pConfig()->set(local_user(), 'wppost', 'wp_username'    ,   trim($_POST['wp_username']));
+		DI::pConfig()->set(local_user(), 'wppost', 'wp_password'    ,   trim($_POST['wp_password']));
+		DI::pConfig()->set(local_user(), 'wppost', 'wp_blog'        ,   trim($_POST['wp_blog']));
+		DI::pConfig()->set(local_user(), 'wppost', 'backlink'       , intval($_POST['wp_backlink']));
+		DI::pConfig()->set(local_user(), 'wppost', 'shortcheck'     , intval($_POST['wp_shortcheck']));
+		$wp_backlink_text = BBCode::convert(trim($_POST['wp_backlink_text']), false, BBCode::BACKLINK);
 		$wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
-		DI::pConfig()->set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
+		DI::pConfig()->set(local_user(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
 	}
-
 }
 
 function wppost_hook_fork(&$a, &$b)
@@ -196,11 +180,11 @@ function wppost_post_local(&$a, &$b) {
 		return;
 	}
 
-	$wp_post   = intval(DI::pConfig()->get(local_user(),'wppost','post'));
+	$wp_post   = intval(DI::pConfig()->get(local_user(), 'wppost', 'post'));
 
 	$wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'wppost','post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'wppost', 'post_by_default'))) {
 		$wp_enable = 1;
 	}
 
@@ -239,12 +223,14 @@ function wppost_send(&$a, &$b)
 		return;
 	}
 
+	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
+
 	$wp_username = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_username'));
 	$wp_password = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_password'));
 	$wp_blog = DI::pConfig()->get($b['uid'],'wppost','wp_blog');
 	$wp_backlink_text = DI::pConfig()->get($b['uid'],'wppost','wp_backlink_text');
 	if ($wp_backlink_text == '') {
-		$wp_backlink_text = L10n::t('Read the orig­i­nal post and com­ment stream on Friendica');
+		$wp_backlink_text = DI::l10n()->t('Read the orig­i­nal post and com­ment stream on Friendica');
 	}
 
 	if ($wp_username && $wp_password && $wp_blog) {
@@ -288,7 +274,7 @@ function wppost_send(&$a, &$b)
 			// If no bookmark is found then take the first line
 			if ($wptitle == '') {
 				// Remove the share element before fetching the first line
-				$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body']));
+				$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism", "\n$1\n", $b['body']));
 
 				$title = HTML::toPlaintext(BBCode::convert($title, false), 0, true)."\n";
 				$pos = strpos($title, "\n");
@@ -302,12 +288,12 @@ function wppost_send(&$a, &$b)
 			}
 		}
 
-		$title = '<title>' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '</title>';
-		$post = BBCode::convert($b['body'], false, 4);
+		$title = '<title>' . (($wptitle) ? $wptitle : DI::l10n()->t('Post from Friendica')) . '</title>';
+		$post = BBCode::convert($b['body'], false, BBCode::CONNECTORS);
 
 		// If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
-		$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
-		$post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+		$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism', "\n$1\n", $post);
+		$post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism', "\n$1\n", $post);
 
 		$post = $title.$post;
 
@@ -339,7 +325,7 @@ EOT;
 		Logger::log('wppost: data: ' . $xml, Logger::DATA);
 
 		if ($wp_blog !== 'test') {
-			$x = Network::post($wp_blog, $xml)->getBody();
+			$x = DI::httpRequest()->post($wp_blog, $xml)->getBody();
 		}
 		Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG);
 	}