X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=wppost%2Fwppost.php;h=28e4e36946af907978a89f16acf6045e1470f60d;hb=10843ca8aca8ace932bdc107d35f140c2f82bea5;hp=9aac6c3801987e3c2fb517ef841d78ef1bda122c;hpb=2bf19ae652694f69f3a200e58a6e1acebbe41584;p=friendica-addons.git

diff --git a/wppost/wppost.php b/wppost/wppost.php
old mode 100644
new mode 100755
index 9aac6c38..28e4e369
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -2,22 +2,31 @@
 
 /**
  * Name: WordPress Post Connector
+ * Description: Post to WordPress (or anything else which uses blogger XMLRPC API)
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
 function wppost_install() {
-    register_hook('post_local_end',   'addon/wppost/wppost.php', 'wppost_send');
-    register_hook('jot_networks',     'addon/wppost/wppost.php', 'wppost_jot_nets');
-    register_hook('plugin_settings',  'addon/wppost/wppost.php', 'wppost_settings');
-    register_hook('plugin_settings_post',  'addon/wppost/wppost.php', 'wppost_settings_post');
+    register_hook('post_local',           'addon/wppost/wppost.php', 'wppost_post_local');
+    register_hook('notifier_normal',      'addon/wppost/wppost.php', 'wppost_send');
+    register_hook('jot_networks',         'addon/wppost/wppost.php', 'wppost_jot_nets');
+    register_hook('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
+    register_hook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
 
 }
 function wppost_uninstall() {
-    unregister_hook('post_local_end',   'addon/wppost/wppost.php', 'wppost_send');
+    unregister_hook('post_local',       'addon/wppost/wppost.php', 'wppost_post_local');
+    unregister_hook('notifier_normal',  'addon/wppost/wppost.php', 'wppost_send');
     unregister_hook('jot_networks',     'addon/wppost/wppost.php', 'wppost_jot_nets');
+    unregister_hook('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
+    unregister_hook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
+
+	// obsolete - remove
+    unregister_hook('post_local_end',   'addon/wppost/wppost.php', 'wppost_send');
     unregister_hook('plugin_settings',  'addon/wppost/wppost.php', 'wppost_settings');
     unregister_hook('plugin_settings_post',  'addon/wppost/wppost.php', 'wppost_settings_post');
+
 }
 
 
@@ -29,7 +38,7 @@ function wppost_jot_nets(&$a,&$b) {
     if(intval($wp_post) == 1) {
         $wp_defpost = get_pconfig(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" /> '
+        $b .= '<div class="profile-jot-net"><input type="checkbox" name="wppost_enable" ' . $selected . ' value="1" /> '
             . t('Post to Wordpress') . '</div>';
     }
 }
@@ -109,41 +118,81 @@ function wppost_settings_post(&$a,&$b) {
 
 }
 
+function wppost_post_local(&$a,&$b) {
 
+	// This can probably be changed to allow editing by pointing to a different API endpoint
 
-
-function wppost_send(&$a,&$b) {
-
-	if((! local_user()) || (local_user() != $b['uid']))
+	if($b['edit'])
 		return;
 
-	if($b['prvnets'] && $b['private'])
+	if((! local_user()) || (local_user() != $b['uid']))
 		return;
 
-	if($b['parent'])
+	if($b['private'] || $b['parent'])
 		return;
 
-	$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_post   = intval(get_pconfig(local_user(),'wppost','post'));
 
-	$wp_enable = (($wp_post && x($_POST,'wppost_enable')) ? intval($_POST['wppost_enable']) : 0);
+	$wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0);
 
-	if($_POST['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default')))
+	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default')))
 		$wp_enable = 1;
 
-	if($wp_username && $wp_password && $wp_blog && $wp_post && $wp_enable) {
+    if(! $wp_enable)
+       return;
+
+    if(strlen($b['postopts']))
+       $b['postopts'] .= ',';
+     $b['postopts'] .= 'wppost';
+}
+
+
+
+
+function wppost_send(&$a,&$b) {
+
+    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+        return;
+
+    if(! strstr($b['postopts'],'wppost'))
+        return;
+
+    if($b['parent'] != $b['id'])
+        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');
+
+	if($wp_username && $wp_password && $wp_blog) {
 
 		require_once('include/bbcode.php');
+		require_once('include/html2plain.php');
 
-		$post = (($b['title']) ? '<title>' . $b['title'] . '</title>' : '');
-		$post .= bbcode($b['body']);
-			$post = xmlify($post);
+		// If the title is empty then try to guess
+		if ($b['title'] == '') {
+			// Take the description from the bookmark
+			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
+				$b['title'] = $matches[2];
 
-		$xml = <<< EOT
+			// If no bookmark is found then take the first line
+			if ($b['title'] == '') {
+				$title = html2plain(bbcode($b['body']), 0, true);
+				$pos = strpos($title, "\n");
+				if (($pos == 0) or ($pos > 60))
+					$pos = 60;
 
-<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>
+				$b['title'] = substr($title, 0, $pos);
+			}
+		}
+
+		$title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
+		$post = $title . bbcode($b['body']);
+		$post = xmlify($post);
+
+		$xml = <<< EOT
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <methodCall>
   <methodName>blogger.newPost</methodName>
   <params>
@@ -162,7 +211,7 @@ EOT;
 
 		if($wp_blog !== 'test')
 			$x = post_url($wp_blog,$xml);
-		logger('posted to wordpress');
+		logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
 
 	}
 }