X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=wppost%2Fwppost.php;h=f148310187c52aebab76d2493b460ba48a8dc5b7;hb=42eefed6e68d241bd8bdf9eceea96abc445a9cac;hp=fc3d3a10acccd1058099181e7619956834426e4b;hpb=72089a2be83293a32d169561714d63e694f73703;p=friendica-addons.git

diff --git a/wppost/wppost.php b/wppost/wppost.php
index fc3d3a10..f1483101 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -3,10 +3,12 @@
 /**
  * Name: WordPress Post Connector
  * Description: Post to WordPress (or anything else which uses blogger XMLRPC API)
- * Version: 1.0
+ * Version: 1.1
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+use Friendica\Core\PConfig;
+
 function wppost_install() {
     register_hook('post_local',           'addon/wppost/wppost.php', 'wppost_post_local');
     register_hook('notifier_normal',      'addon/wppost/wppost.php', 'wppost_send');
@@ -34,9 +36,9 @@ function wppost_jot_nets(&$a,&$b) {
     if(! local_user())
         return;
 
-    $wp_post = get_pconfig(local_user(),'wppost','post');
+    $wp_post = PConfig::get(local_user(),'wppost','post');
     if(intval($wp_post) == 1) {
-        $wp_defpost = get_pconfig(local_user(),'wppost','post_by_default');
+        $wp_defpost = PConfig::get(local_user(),'wppost','post_by_default');
         $selected = ((intval($wp_defpost) == 1) ? ' checked="checked" ' : '');
         $b .= '<div class="profile-jot-net"><input type="checkbox" name="wppost_enable" ' . $selected . ' value="1" /> '
             . t('Post to Wordpress') . '</div>';
@@ -55,22 +57,23 @@ function wppost_settings(&$a,&$s) {
 
 	/* Get the current state of our config variables */
 
-	$enabled = get_pconfig(local_user(),'wppost','post');
+	$enabled = PConfig::get(local_user(),'wppost','post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 
 	$css = (($enabled) ? '' : '-disabled');
 
-	$def_enabled = get_pconfig(local_user(),'wppost','post_by_default');
-	$back_enabled = get_pconfig(local_user(),'wppost','backlink');
-	$shortcheck_enabled = get_pconfig(local_user(),'wppost','shortcheck');
+	$def_enabled = PConfig::get(local_user(),'wppost','post_by_default');
+	$back_enabled = PConfig::get(local_user(),'wppost','backlink');
+	$shortcheck_enabled = PConfig::get(local_user(),'wppost','shortcheck');
 
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 	$back_checked = (($back_enabled) ? ' checked="checked" ' : '');
 	$shortcheck_checked = (($shortcheck_enabled) ? ' checked="checked" ' : '');
 
-	$wp_username = get_pconfig(local_user(), 'wppost', 'wp_username');
-	$wp_password = get_pconfig(local_user(), 'wppost', 'wp_password');
-	$wp_blog = get_pconfig(local_user(), 'wppost', 'wp_blog');
+	$wp_username = PConfig::get(local_user(), 'wppost', 'wp_username');
+	$wp_password = PConfig::get(local_user(), 'wppost', 'wp_password');
+	$wp_blog = PConfig::get(local_user(), 'wppost', 'wp_blog');
+	$wp_backlink_text = PConfig::get(local_user(), 'wppost', 'wp_backlink_text');
 
 
     /* Add some HTML to the existing form */
@@ -111,6 +114,10 @@ function wppost_settings(&$a,&$s) {
     $s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . t('Provide a backlink to the Friendica post') . '</label>';
     $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">' . 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">' . t("Don't post messages that are too short") . '</label>';
@@ -128,44 +135,55 @@ function wppost_settings_post(&$a,&$b) {
 
 	if(x($_POST,'wppost-submit')) {
 
-		set_pconfig(local_user(),'wppost','post',intval($_POST['wppost']));
-		set_pconfig(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault']));
-		set_pconfig(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
-		set_pconfig(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
-		set_pconfig(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
-		set_pconfig(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
-		set_pconfig(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
+		PConfig::set(local_user(),'wppost','post',intval($_POST['wppost']));
+		PConfig::set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault']));
+		PConfig::set(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
+		PConfig::set(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
+		PConfig::set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
+		PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
+		PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
+		$wp_backlink_text = notags(trim($_POST['wp_backlink_text']));
+		$wp_backlink_text = bbcode($wp_backlink_text, false, false, 8);
+		$wp_backlink_text = html2plain($wp_backlink_text, 0, true);
+		PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
 
 	}
 
 }
 
-function wppost_post_local(&$a,&$b) {
+function wppost_post_local(&$a, &$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
-	if($b['edit'])
+	if ($b['edit']) {
 		return;
+	}
 
-	if((! local_user()) || (local_user() != $b['uid']))
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
+	}
 
-	if($b['private'] || $b['parent'])
+	if ($b['private'] || $b['parent']) {
 		return;
+	}
 
-    $wp_post   = intval(get_pconfig(local_user(),'wppost','post'));
+	$wp_post   = intval(PConfig::get(local_user(),'wppost','post'));
 
 	$wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0);
 
-	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default')))
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'wppost','post_by_default'))) {
 		$wp_enable = 1;
+	}
 
-    if(! $wp_enable)
-       return;
+	if (!$wp_enable) {
+		return;
+	}
+
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
 
-    if(strlen($b['postopts']))
-       $b['postopts'] .= ',';
-     $b['postopts'] .= 'wppost';
+	$b['postopts'] .= 'wppost';
 }
 
 
@@ -183,9 +201,13 @@ function wppost_send(&$a,&$b) {
 		return;
 
 
-	$wp_username = xmlify(get_pconfig($b['uid'],'wppost','wp_username'));
-	$wp_password = xmlify(get_pconfig($b['uid'],'wppost','wp_password'));
-	$wp_blog = get_pconfig($b['uid'],'wppost','wp_blog');
+	$wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
+	$wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password'));
+	$wp_blog = PConfig::get($b['uid'],'wppost','wp_blog');
+	$wp_backlink_text = PConfig::get($b['uid'],'wppost','wp_backlink_text');
+	if ($wp_backlink_text == '') {
+		$wp_backlink_text = t('Read the orig­i­nal post and com­ment stream on Friendica');
+	}
 
 	if($wp_username && $wp_password && $wp_blog) {
 
@@ -195,34 +217,40 @@ function wppost_send(&$a,&$b) {
 
 		$wptitle = trim($b['title']);
 
-		if (intval(get_pconfig($b['uid'],'wppost','shortcheck'))) {
+		if (intval(PConfig::get($b['uid'],'wppost','shortcheck'))) {
 			// Checking, if its a post that is worth a blog post
 			$postentry = false;
 			$siteinfo = get_attached_data($b["body"]);
 
 			// Is it a link to an aricle, a video or a photo?
-			if (isset($siteinfo["type"]))
-				if (in_array($siteinfo["type"], array("link", "audio", "video", "photo")))
+			if (isset($siteinfo["type"])) {
+				if (in_array($siteinfo["type"], array("link", "audio", "video", "photo"))) {
 					$postentry = true;
+				}
+			}
 
 			// Does it have a title?
-			if ($wptitle != "")
+			if ($wptitle != "") {
 				$postentry = true;
+			}
 
 			// Is it larger than 500 characters?
-			if (strlen($b['body']) > 500)
+			if (strlen($b['body']) > 500) {
 				$postentry = true;
+			}
 
-			if (!$postentry)
+			if (!$postentry) {
 				return;
+			}
 		}
 
 		// If the title is empty then try to guess
 		if ($wptitle == '') {
 			// Fetch information about the post
 			$siteinfo = get_attached_data($b["body"]);
-			if (isset($siteinfo["title"]))
+			if (isset($siteinfo["title"])) {
 				$wptitle = $siteinfo["title"];
+			}
 
 			// If no bookmark is found then take the first line
 			if ($wptitle == '') {
@@ -232,7 +260,7 @@ function wppost_send(&$a,&$b) {
 				$title = html2plain(bbcode($title, false, false), 0, true)."\n";
 				$pos = strpos($title, "\n");
 				$trailer = "";
-				if (($pos == 0) or ($pos > 100)) {
+				if (($pos == 0) || ($pos > 100)) {
 					$pos = 100;
 					$trailer = "...";
 				}
@@ -250,10 +278,11 @@ function wppost_send(&$a,&$b) {
 
 		$post = $title.$post;
 
-		$wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
-		if($wp_backlink && $b['plink'])
+		$wp_backlink = intval(PConfig::get($b['uid'],'wppost','backlink'));
+		if($wp_backlink && $b['plink']) {
 			$post .= EOL . EOL . '<a href="' . $b['plink'] . '">'
-				. t('Read the original post and comment stream on Friendica') . '</a>' . EOL . EOL;
+				. $wp_backlink_text . '</a>' . EOL . EOL;
+		}
 
 		$post = xmlify($post);
 
@@ -276,10 +305,10 @@ EOT;
 
 		logger('wppost: data: ' . $xml, LOGGER_DATA);
 
-		if($wp_blog !== 'test')
+		if($wp_blog !== 'test') {
 			$x = post_url($wp_blog,$xml);
+		}
 		logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
 
 	}
 }
-