Code cleanup

diff --git a/mod/item.php b/mod/item.php
index eba8296e708493244793be1e5b10c3bded152728..80a10179e873a71970d7be651ba8cad3d450cf43 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -1214,127 +1214,6 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
                                $newname = $r[0]["name"];
                }
 
-/*
-               //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,' '));
-                               }
-                       }
-                       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",
-                                               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",
-                                               dbesc($newname),
-                                               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",
-                                               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'];
-                       }
-               }
-*/
-
                //if there is an url for this persons profile
                if(isset($profile)) {