Merge remote branch 'upstream/master'

addon/statusnet/statusnet.php

@@ -97,6 +97,28 @@ function statusnet_settings_post ($a,$post) {
             del_pconfig( local_user(), 'statusnet', 'oauthtoken' );
             del_pconfig( local_user(), 'statusnet', 'oauthsecret' );
             del_pconfig( local_user(), 'statusnet', 'baseapi' );
+	} else {
+            if (isset($_POST['statusnet-preconf-apiurl'])) {
+                /***
+                 * If the user used one of the preconfigured StatusNet server credentials
+                 * use them. All the data are available in the global config.
+                 * Check the API Url never the less and blame the admin if it's not working ^^
+                 */
+                $globalsn = get_config('statusnet', 'sites');
+                foreach ( $globalsn as $asn) {
+                    if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) {
+                        $apibase = $asn['apiurl'];
+                        $c = fetch_url( $apibase . 'statusnet/version.xml' );
+                        if (strlen($c) > 0) {
+                            set_pconfig(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
+                            set_pconfig(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
+                            set_pconfig(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
+                        } else {
+                            notice( t('Please contact your site administrator.<br />The provided API URL is not valid.').EOL.$asn['apiurl'].EOL );
+                        }
+                    }
+                }
+                goaway($a->get_baseurl().'/settings/addon');
             } else {
             if (isset($_POST['statusnet-consumersecret'])) {
                 //  check if we can reach the API of the StatusNet server
@@ -148,7 +170,7 @@ function statusnet_settings_post ($a,$post) {
         	    set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
         	    set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
         		notice( t('StatusNet settings updated.') . EOL);
-	}}}
+        	}}}}
 }
 function statusnet_settings(&$a,&$s) {
         if(! local_user())
@@ -176,17 +198,35 @@ function statusnet_settings(&$a,&$s) {
 		/***
 		 * no consumer keys
                  */
+            $globalsn = get_config('statusnet', 'sites');
+            /***
+             * lets check if we have one or more globally configured StatusNet
+             * server OAuth credentials in the configuration. If so offer them
+             * with a little explanation to the user as choice - otherwise
+             * ignore this option entirely.
+             */
+            if (! $globalsn == null) {
+                $s .= '<h4>' . t('Globally Available StatusNet OAuthKeys') . '</h4>';
+                $s .= '<p>'. t('There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below).') .'</p>';
+                $s .= '<div id="statusnet-preconf-wrapper">';
+                foreach ($globalsn as $asn) {
+                    $s .= '<input type="radio" name="statusnet-preconf-apiurl" value="'. $asn['apiurl'] .'">'. $asn['sitename'] .'<br />';
+                }
+                $s .= '<p></p><div class="clear"></div></div>';
+                $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+            }
+            $s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>';
             $s .= '<p>'. t('No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.') .'</p>';
             $s .= '<div id="statusnet-consumer-wrapper">';
             $s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">'. t('OAuth Consumer Key') .'</label>';
-				$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" />';
+            $s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
             $s .= '<div class="clear"></div>';
             $s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>';
-				$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" />';
+            $s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
             $s .= '<div class="clear"></div>';
             $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
-		$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" />';
+            $s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
-                $s .= '<div class="clear"></div></div>';
+            $s .= '<p></p><div class="clear"></div></div>';
             $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 	} else {
 		/***

boot.php

@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.987' );
+define ( 'FRIENDIKA_VERSION',      '2.2.988' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1054      );
 
@@ -1508,6 +1508,8 @@ function lrdd($uri) {
 	logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
 
 	$h = parse_xml_string($xml);
+	if(! $h)
+		return array();
 
 	$arr = convert_xml_element_to_array($h);
 
@@ -1672,6 +1674,9 @@ function fetch_xrd_links($url) {
 
 	logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
 	$h = parse_xml_string($xml);
+	if(! $h)
+		return array();
+
 	$arr = convert_xml_element_to_array($h);
 
 	$links = array();

include/Scrape.php

@@ -292,7 +292,9 @@ function probe_url($url) {
 	$diaspora = false;	
 	$email_conversant = false;
 
-	if($url) {
+	$twitter = ((strpos($url,'twitter.com') !== false) ? true : false);
+
+	if(! $twitter) {
 		$links = lrdd($url);
 
 		if(count($links)) {
@@ -413,19 +415,33 @@ function probe_url($url) {
 				$profile = $url;
 		}
 
+		if($twitter) {		
+			logger('twitter: setup');
+			$tid = basename($url);
+			$tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
+			if(intval($tid))
+				$poll = $tapi . '?user_id=' . $tid;
+			else
+				$poll = $tapi . '?screen_name=' . $tid;
+			$profile = 'http://twitter.com/!#/' . $tid;
+		}
+
 		if(! x($vcard,'fn'))
 			if(x($vcard,'nick'))
 				$vcard['fn'] = $vcard['nick'];
 
-		if((! isset($vcard)) && (! $poll)) {
 	
-			$ret = scrape_feed($url);
+		if(((! isset($vcard)) && (! $poll)) || ($twitter)) {
-			logger('probe_url: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA);
+
-			if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
+			$feedret = scrape_feed($url);
-				$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
+			logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA);
+			if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
+				$poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));
 				$vcard = array();
-					if(x($ret,'photo'))
+			}
-						$vcard['photo'] = $ret['photo'];
+
+			if(x($feedret,'photo'))
+				$vcard['photo'] = $feedret['photo'];
 			require_once('simplepie/simplepie.inc');
 		    $feed = new SimplePie();
 			$xml = fetch_url($poll);
@@ -443,9 +459,6 @@ function probe_url($url) {
 					$vcard['fn'] = trim(unxmlify($author->get_email()));
 				if(strpos($vcard['fn'],'@') !== false)
 					$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
-					$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
-					if(strpos($vcard['nick'],' '))
-						$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
 				$email = unxmlify($author->get_email());
 			}
 			else {
@@ -458,9 +471,6 @@ function probe_url($url) {
 							$vcard['fn'] = trim(unxmlify($author->get_email()));
 						if(strpos($vcard['fn'],'@') !== false)
 							$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
-							$vcard['nick'] = strtolower(unxmlify($vcard['fn']));
-							if(strpos($vcard['nick'],' '))
-								$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
 						$email = unxmlify($author->get_email());
 					}
 					if(! $vcard['photo']) {
@@ -476,15 +486,25 @@ function probe_url($url) {
 				$lnk = $feed->get_permalink();
 			if(isset($lnk) && strlen($lnk))
 				$profile = $lnk;	
+
 			if(! (x($vcard,'fn')))
 				$vcard['fn'] = notags($feed->get_title());
 			if(! (x($vcard,'fn')))
 				$vcard['fn'] = notags($feed->get_description());
+
+			if(strpos($vcard['fn'],'Twitter / ') !== false) {
+				$vcard['fn'] = substr($vcard['fn'],strpos($vcard['fn'],'/')+1);
+				$vcard['fn'] = trim($vcard['fn']);
+			}
+			if(! x($vcard,'nick')) {
+				$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
+				if(strpos($vcard['nick'],' '))
+					$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+			}
 			$network = 'feed';
 			$priority = 2;
 		}
 	}
-	}
 
 	if(! x($vcard,'photo')) {
 		$a = get_app();

include/conversation.php

@@ -357,7 +357,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 			if($page_writeable) {
 				if($toplevelpost) {
-					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+					$likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array(
 						'$id' => $item['id'],
 						'$likethis' => t("I like this \x28toggle\x29"),
 						'$nolike' => t("I don't like this \x28toggle\x29"),

include/items.php

@@ -384,6 +384,9 @@ function get_atom_elements($feed,$item) {
 	else
 		$res['private'] = 0;
 
+	$extid = $item->get_item_tags(NAMESPACE_DFRN,'extid');
+	if($extid && $extid[0]['data'])
+		$res['extid'] = $extid[0]['data'];
 
 	$rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
 	if($rawlocation)
@@ -634,6 +637,7 @@ function item_store($arr,$force_parent = false) {
 
 	$arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
 	$arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : random_string());
+	$arr['extid']         = ((x($arr,'extid'))         ? notags(trim($arr['extid']))         : '');
 	$arr['author-name']   = ((x($arr,'author-name'))   ? notags(trim($arr['author-name']))   : '');
 	$arr['author-link']   = ((x($arr,'author-link'))   ? notags(trim($arr['author-link']))   : '');
 	$arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : '');
@@ -1568,6 +1572,10 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
 		$o .= '<dfrn:private>1</dfrn:private>' . "\r\n";
 
+	if($item['extid'])
+		$o .= '<dfrn:extid>' . $item['extid'] . '</dfrn:extid>' . "\r\n";
+
+
 	$verb = construct_verb($item);
 	$o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
 	$actobj = construct_activity_object($item);

mod/follow.php

@@ -12,7 +12,7 @@ function follow_post(&$a) {
 
 	$url = $orig_url = notags(trim($_POST['url']));
 
-	// remove ajax junk
+	// remove ajax junk, e.g. Twitter
 
 	$url = str_replace('/#!/','/',$url);
 
@@ -41,6 +41,14 @@ function follow_post(&$a) {
 	
 	if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
 		notice( t('The profile address specified does not provide adequate information.') . EOL);
+		if(! x($ret,'poll'))
+			notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+		if(! x($ret,'name'))
+			notice( t('An author or name was not found.') . EOL);
+		if(! x($ret,'url'))
+			notice( t('No browser URL could be matched to this address.') . EOL);
+		if(strpos($url,'@') !== false)
+			notice('Unable to match @-style Identity Address with a known protocol or email contact');
 		goaway($_SESSION['return_url']);
 	}
 

mod/friendika.php

@@ -63,6 +63,8 @@ function friendika_content(&$a) {
 	else
 		$o .= '<p>' . t('No installed plugins/addons/apps');
 
+	call_hooks('about_hook', $o); 	
+
 	return $o;
 
 }

mod/item.php

@@ -589,9 +589,6 @@ function item_post(&$a) {
 			dbesc(datetime_convert()),
 			intval($post_id)
 		);
-		foreach( $r as $key => $val) {
-			logger("key: " . $key . " val: " . $val);
-		}
 
 		// photo comments turn the corresponding item visible to the profile wall
 		// This way we don't see every picture in your new photo album posted to your wall at once.