X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=8c5a479646ec992c98bd0b701e2a3cbdc51d012a;hb=d6c1889a2039033b14a88cdb031461cadabf2114;hp=a5f483b3524089f778a226b792fae04c845473de;hpb=5a1bb9866dbb09b00861688f4a78baf0391ea58f;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index a5f483b352..8c5a479646 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -18,7 +18,6 @@
 require_once('include/crypto.php');
 require_once('include/enotify.php');
 require_once('include/email.php');
-require_once('library/langdet/Text/LanguageDetect.php');
 require_once('include/tags.php');
 require_once('include/files.php');
 require_once('include/threads.php');
@@ -138,14 +137,25 @@ function item_post(&$a) {
 				AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
 				$parent_contact = null;
 
-				require_once("include/Scrape.php");
-				$probed_contact = probe_url($thrparent[0]["author-link"]);
-				if ($probed_contact["network"] != NETWORK_FEED) {
-					$parent_contact = $probed_contact;
-					$parent_contact["nurl"] = normalise_link($probed_contact["url"]);
-					$parent_contact["thumb"] = $probed_contact["photo"];
-					$parent_contact["micro"] = $probed_contact["photo"];
-					$parent_contact["addr"] = $probed_contact["addr"];
+				$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+					dbesc(normalise_link($thrparent[0]["author-link"])));
+				if (count($r)) {
+					$parent_contact = $r[0];
+					$parent_contact["thumb"] = $parent_contact["photo"];
+					$parent_contact["micro"] = $parent_contact["photo"];
+					unset($parent_contact["id"]);
+				}
+
+				if (!isset($parent_contact["nick"])) {
+					require_once("include/Scrape.php");
+					$probed_contact = probe_url($thrparent[0]["author-link"]);
+					if ($probed_contact["network"] != NETWORK_FEED) {
+						$parent_contact = $probed_contact;
+						$parent_contact["nurl"] = normalise_link($probed_contact["url"]);
+						$parent_contact["thumb"] = $probed_contact["photo"];
+						$parent_contact["micro"] = $probed_contact["photo"];
+						$parent_contact["addr"] = $probed_contact["addr"];
+					}
 				}
 				logger('no contact found: '.print_r($thrparent, true), LOGGER_DEBUG);
 			} else
@@ -177,10 +187,6 @@ function item_post(&$a) {
 	// have been provided, and run any anti-spam plugins
 
 
-	// TODO
-
-
-
 
 	if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
 		notice( t('Permission denied.') . EOL) ;
@@ -268,32 +274,8 @@ function item_post(&$a) {
 		$guid              = get_guid(32);
 
 
-		$naked_body = preg_replace('/\[(.+?)\]/','',$body);
-
-		if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-			$l = new Text_LanguageDetect;
-			//$lng = $l->detectConfidence($naked_body);
-			//$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
-
-			$lng = $l->detect($naked_body, 3);
-
-			if (sizeof($lng) > 0) {
-				$postopts = "";
-
-				foreach ($lng as $language => $score) {
-					if ($postopts == "")
-						$postopts = "lang=";
-					else
-						$postopts .= ":";
-
-					$postopts .= $language.";".$score;
-				}
-			}
-
-			logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
-		}
-		else
-			$postopts = '';
+		item_add_language_opt($_REQUEST);
+		$postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : "";
 
 
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
@@ -387,8 +369,7 @@ function item_post(&$a) {
 	if((local_user()) && (local_user() == $profile_uid)) {
 		$self = true;
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-			intval($_SESSION['uid'])
-		);
+			intval($_SESSION['uid']));
 	}
 	elseif(remote_user()) {
 		if(is_array($_SESSION['remote'])) {
@@ -674,7 +655,7 @@ function item_post(&$a) {
 
 	$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
 
-	$uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid));
+	$uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid, $guid));
 
 	// Fallback so that we alway have a thr-parent
 	if(!$thr_parent)
@@ -723,7 +704,8 @@ function item_post(&$a) {
 	$datarray['postopts']      = $postopts;
 	$datarray['origin']        = $origin;
 	$datarray['moderated']     = $allow_moderated;
-
+	$datarray['gcontact-id']   = get_gcontact_id(array("url" => $datarray['author-link'], "network" => $datarray['network'],
+							"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']));
 	/**
 	 * These fields are for the convenience of plugins...
 	 * 'self' if true indicates the owner is posting on their own wall
@@ -918,7 +900,7 @@ function item_post(&$a) {
 
 
 		// Store the comment signature information in case we need to relay to Diaspora
-		store_diaspora_comment_sig($datarray, $author, ($self ? $a->user['prvkey'] : false), $parent_item, $post_id);
+		store_diaspora_comment_sig($datarray, $author, ($self ? $user['prvkey'] : false), $parent_item, $post_id);
 
 	} else {
 		$parent = $post_id;
@@ -1090,6 +1072,8 @@ function item_content(&$a) {
  * @return boolean true if replaced, false if not replaced
  */
 function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
+	require_once("include/Scrape.php");
+	require_once("include/socgraph.php");
 
 	$replaced = false;
 	$r = null;
@@ -1124,122 +1108,115 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 		$stat = false;
 		//get the person's name
 		$name = substr($tag,1);
-		//is it a link or a full dfrn address?
-		if((strpos($name,'@')) || (strpos($name,'http://'))) {
-			$newname = $name;
-			//get the profile links
-			$links = @lrdd($name);
-			if(count($links)) {
-				//for all links, collect how is to inform and how's profile is to link
-				foreach($links as $link) {
-					if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-						$profile = $link['@attributes']['href'];
-					if($link['@attributes']['rel'] === 'salmon') {
-						if(strlen($inform))
-							$inform .= ',';
-						$inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
-					}
-				}
-			}
-		} elseif (($network != NETWORK_OSTATUS) AND ($network != NETWORK_TWITTER) AND
-			($network != NETWORK_STATUSNET) AND ($network != NETWORK_APPNET)) {
-			//if it is a name rather than an address
-			$newname = $name;
-			$alias = '';
-			$tagcid = 0;
-			//is it some generated name?
-			if(strrpos($newname,'+')) {
-				//get the id
-				$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
-				//remove the next word from tag's name
-				if(strpos($name,' ')) {
-					$name = substr($name,0,strpos($name,' '));
+
+		// Sometimes the tag detection doesn't seem to work right
+		// This is some workaround
+		$nameparts = explode(" ", $name);
+		$name = $nameparts[0];
+
+		// Try to detect the contact in various ways
+		if ((strpos($name,'@')) || (strpos($name,'http://'))) {
+			// Is it in format @user@domain.tld or @http://domain.tld/...?
+
+			// First check the contact table for the address
+			$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact` WHERE `addr` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($name),
+					intval($profile_uid)
+			);
+
+			// Then check in the contact table for the url
+			if (!$r)
+				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `notify`, `network` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc(normalise_link($name)),
+						intval($profile_uid)
+				);
+
+			// Then check in the global contacts for the address
+			if (!$r)
+				$r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `addr` = '%s' LIMIT 1", dbesc($name));
+
+			// Then check in the global contacts for the url
+			if (!$r)
+				$r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link($name)));
+
+			// If the data isn't complete then refetch the data
+			if ($r AND ($r[0]["network"] == NETWORK_OSTATUS) AND (($r[0]["notify"] == "") OR ($r[0]["alias"] == "")))
+				$r = false;
+
+			if (!$r) {
+				$probed = probe_url($name);
+				if (isset($probed["url"])) {
+					update_gcontact($probed);
+					$r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+						dbesc(normalise_link($probed["url"])));
 				}
 			}
-			if($tagcid) { //if there was an id
-				//select contact with that id from the logged in user's contact list
-				$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		} else {
+			$r = false;
+			if (strrpos($name,'+')) {
+				// Is it in format @nick+number?
+				$tagcid = intval(substr($name,strrpos($name,'+') + 1));
+
+				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 						intval($tagcid),
 						intval($profile_uid)
 				);
 			}
-			else {
-				$newname = str_replace('_',' ',$name);
-
-				// At first try to fetch a contact according to the given network
-				if ($network != "") {
-					//select someone from this user's contacts by name
-					$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
-							dbesc($newname),
-							dbesc($network),
-							intval($profile_uid)
-					);
-					if(! $r) {
-						//select someone by attag or nick and the name passed in
-						$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
-								dbesc($name),
-								dbesc($name),
-								dbesc($network),
-								intval($profile_uid)
-						);
-					}
-				} else
-					$r = false;
-
-				if(! $r) {
-					//select someone from this user's contacts by name
-					$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-							dbesc($newname),
-							intval($profile_uid)
-					);
-				}
 
-				if(! $r) {
-					//select someone by attag or nick and the name passed in
-					$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
-							dbesc($name),
-							dbesc($name),
-							intval($profile_uid)
-					);
-				}
-			}
-/*			} elseif(strstr($name,'_') || strstr($name,' ')) { //no id
-				//get the real name
-				$newname = str_replace('_',' ',$name);
-				//select someone from this user's contacts by name
-				$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+			//select someone by attag or nick and the name passed in the current network
+			if(!$r AND ($network != ""))
+				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+						dbesc($name),
+						dbesc($name),
+						dbesc($network),
+						intval($profile_uid)
+				);
+
+			//select someone from this user's contacts by name in the current network
+			if (!$r AND ($network != ""))
+				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($newname),
+						dbesc($network),
 						intval($profile_uid)
 				);
-			} else {
-				//select someone by attag or nick and the name passed in
-				$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+
+			//select someone by attag or nick and the name passed in
+			if(!$r)
+				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 						dbesc($name),
 						dbesc($name),
 						intval($profile_uid)
 				);
-			}*/
-			//$r is set, if someone could be selected
-			if(count($r)) {
-				$profile = $r[0]['url'];
-				//set newname to nick, find alias
-				if(($r[0]['network'] === NETWORK_OSTATUS) OR ($r[0]['network'] === NETWORK_TWITTER)
-					OR ($r[0]['network'] === NETWORK_STATUSNET) OR ($r[0]['network'] === NETWORK_APPNET)) {
-					$newname = $r[0]['nick'];
-					$stat = true;
-					if($r[0]['alias'])
-						$alias = $r[0]['alias'];
-				}
-				else
-					$newname = $r[0]['name'];
-				//add person's id to $inform
-				if(strlen($inform))
-					$inform .= ',';
-				$inform .= 'cid:' . $r[0]['id'];
-			}
+
+
+			//select someone from this user's contacts by name
+			if(!$r)
+				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc($newname),
+						intval($profile_uid)
+				);
 		}
+
+		if ($r) {
+			if(strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"])))
+				$inform .= ',';
+
+			if (isset($r[0]["id"]))
+				$inform .= 'cid:' . $r[0]["id"];
+			elseif (isset($r[0]["notify"]))
+				$inform  .= $r[0]["notify"];
+
+			$profile = $r[0]["url"];
+			$alias   = $r[0]["alias"];
+			$newname = $r[0]["nick"];
+			if (($newname == "") OR (($r[0]["network"] != NETWORK_OSTATUS) AND ($r[0]["network"] != NETWORK_TWITTER)
+				AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET)))
+				$newname = $r[0]["name"];
+		}
+
 		//if there is an url for this persons profile
 		if(isset($profile)) {
+
 			$replaced = true;
 			//create profile link
 			$profile = str_replace(',','%2c',$profile);
@@ -1294,7 +1271,7 @@ function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item,
 	$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $diaspora_handle;
 
 	if( $uprvkey !== false )
-		$authorsig = base64_encode(rsa_sign($signed_text,$uprvkey,'sha256'));
+		$authorsig = rsa_sign($signed_text,$uprvkey,'sha256');
 	else
 		$authorsig = '';