Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  syntax error from pasted text, remove ^M's
  bug #335 network search broken after new ssl policy settings
  whitespace
  notification for disapora comments

* master:

diff --git a/include/diaspora.php b/include/diaspora.php
index dca857a19833369cf9f5d43eca1e41e8e5820b41..19bba52168367c8e07789749469f7615e8957612 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1159,6 +1159,48 @@ function diaspora_comment($importer,$xml,$msg) {
 
                proc_run('php','include/notifier.php','comment',$message_id);
        }
+
+       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+               dbesc($parent_item['uri']),
+               intval($importer['uid'])
+       );
+
+       if(count($myconv)) {
+               $importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
+
+               foreach($myconv as $conv) {
+
+                       // now if we find a match, it means we're in this conversation
+       
+                       if(! link_compare($conv['author-link'],$importer_url))
+                               continue;
+
+                       require_once('include/enotify.php');
+                                                               
+                       $conv_parent = $conv['parent'];
+
+                       notification(array(
+                               'type'         => NOTIFY_COMMENT,
+                               'notify_flags' => $importer['notify-flags'],
+                               'language'     => $importer['language'],
+                               'to_name'      => $importer['username'],
+                               'to_email'     => $importer['email'],
+                               'uid'          => $importer['uid'],
+                               'item'         => $datarray,
+                               'link'             => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+                               'source_name'  => $datarray['author-name'],
+                               'source_link'  => $datarray['author-link'],
+                               'source_photo' => $datarray['author-avatar'],
+                               'verb'         => ACTIVITY_POST,
+                               'otype'        => 'item',
+                               'parent'       => $conv_parent,
+
+                       ));
+
+                       // only send one notification
+                       break;
+               }
+       }
        return;
 }
 

diff --git a/include/items.php b/include/items.php
index 68acb45f9b6fc7bbf86183316421dd3587b2bf3d..5e1fec55785d55e41611a439ee93f4e0de8e0c93 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -2026,6 +2026,7 @@ function local_delivery($importer,$data) {
                                        if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
                                                $xo = parse_xml_string($item['object'],false);
                                                $xt = parse_xml_string($item['target'],false);
+
                                                if($xt->type === ACTIVITY_OBJ_NOTE) {
                                                        $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
                                                                dbesc($xt->id),

diff --git a/include/text.php b/include/text.php
index d34fd7fbeec35bcacfb5a1bd2fa201a3e770d692..cdf82ca87dfe7f4e48c7df146ea9e293c186d0e9 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -638,7 +638,7 @@ if(! function_exists('search')) {
 function search($s,$id='search-box',$url='/search',$save = false) {
        $a = get_app();
        $o  = '<div id="' . $id . '">';
-       $o .= '<form action="' . $a->get_baseurl() . $url . '" method="get" >';
+       $o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
        $o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
        $o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
        if($save)

diff --git a/mod/item.php b/mod/item.php
index 98cfb4338512bc57d7de2fb6ea5d44658975363d..07b4bfef7665990ade9f16305dfa6b97ddbd6b3d 100755 (executable)
--- a/mod/item.php
+++ b/mod/item.php
@@ -832,129 +832,129 @@ function item_content(&$a) {
  */
 function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
        //is it a hash tag? 
-       if(strpos($tag,'#') === 0) {\r
+       if(strpos($tag,'#') === 0) {
                //if the tag is replaced...
                if(strpos($tag,'[url='))
-                       //...do nothing\r
-                       continue;
-               //base tag has the tags name only\r
-               $basetag = str_replace('_',' ',substr($tag,1));\r
+                       //...do nothing
+                       return;
+               //base tag has the tags name only
+               $basetag = str_replace('_',' ',substr($tag,1));
                //create text for link
                $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
-               //replace tag by the link\r
-               $body = str_replace($tag, $newtag, $body);\r
+               //replace tag by the link
+               $body = str_replace($tag, $newtag, $body);
        
-               //is the link already in str_tags?\r
-               if(! stristr($str_tags,$newtag)) {\r
+               //is the link already in str_tags?
+               if(! stristr($str_tags,$newtag)) {
                        //append or set str_tags
-                       if(strlen($str_tags))\r
-                               $str_tags .= ',';\r
-                       $str_tags .= $newtag;\r
-               }\r
-               return;\r
+                       if(strlen($str_tags))
+                               $str_tags .= ',';
+                       $str_tags .= $newtag;
+               }
+               return;
        }
-       //is it a person tag? \r
-       if(strpos($tag,'@') === 0) {\r
+       //is it a person tag? 
+       if(strpos($tag,'@') === 0) {
                //is it already replaced? 
-               if(strpos($tag,'[url='))\r
-                       continue;\r
-               $stat = false;\r
+               if(strpos($tag,'[url='))
+                       continue;
+               $stat = false;
                //get the person's name
                $name = substr($tag,1);
-               //is it a link or a full dfrn address? \r
-               if((strpos($name,'@')) || (strpos($name,'http://'))) {\r
-                       $newname = $name;\r
+               //is it a link or a full dfrn address? 
+               if((strpos($name,'@')) || (strpos($name,'http://'))) {
+                       $newname = $name;
                        //get the profile links
-                       $links = @lrdd($name);\r
-                       if(count($links)) {\r
+                       $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) {\r
-                                       if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')\r
-                                               $profile = $link['@attributes']['href'];\r
-                                       if($link['@attributes']['rel'] === 'salmon') {\r
-                                               if(strlen($inform))\r
-                                                       $inform .= ',';\r
-                                               $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);\r
-                                       }\r
-                               }\r
-                       }\r
-               } else { //if it is a name rather than an address\r
-                       $newname = $name;\r
-                       $alias = '';\r
+                               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']);
+                                       }
+                               }
+                       }
+               } else { //if it is a name rather than an address
+                       $newname = $name;
+                       $alias = '';
                        $tagcid = 0;
-                       //is it some generated name?\r
-                       if(strrpos($newname,'+')) {\r
+                       //is it some generated name?
+                       if(strrpos($newname,'+')) {
                                //get the id
-                               $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));\r
+                               $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
                                //remove the next word from tag's name
-                               if(strpos($name,' ')) {\r
+                               if(strpos($name,' ')) {
                                        $name = substr($name,0,strpos($name,' '));
-                               }\r
+                               }
                        }
                        if($tagcid) { //if there was an id
-                               //select contact with that id from the logged in user's contact list\r
-                               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",\r
-                                               intval($tagcid),\r
+                               //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)
-                               );\r
+                               );
                        } elseif(strstr($name,'_') || strstr($name,' ')) { //no id
-                               //get the real name\r
-                               $newname = str_replace('_',' ',$name);\r
+                               //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",\r
-                                               dbesc($newname),\r
-                                               intval($profile_uid)\r
-                               );\r
+                               $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
-                               $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",\r
-                                               dbesc($name),\r
-                                               dbesc($name),\r
-                                               intval($profile_uid)\r
-                               );\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)
+                               );
                        }
-                       //$r is set, if someone could be selected\r
-                       if(count($r)) {\r
+                       //$r is set, if someone could be selected
+                       if(count($r)) {
                                $profile = $r[0]['url'];
-                               //set newname to nick, find alias\r
-                               if($r[0]['network'] === 'stat') {\r
-                                       $newname = $r[0]['nick'];\r
-                                       $stat = true;\r
-                                       if($r[0]['alias'])\r
-                                               $alias = $r[0]['alias'];\r
-                               }\r
-                               else\r
-                                       $newname = $r[0]['name'];\r
+                               //set newname to nick, find alias
+                               if($r[0]['network'] === 'stat') {
+                                       $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))\r
-                                       $inform .= ',';\r
-                               $inform .= 'cid:' . $r[0]['id'];\r
-                       }\r
+                               if(strlen($inform))
+                                       $inform .= ',';
+                               $inform .= 'cid:' . $r[0]['id'];
+                       }
                }
-               //if there is an url for this persons profile\r
-               if(isset($profile)) {\r
+               //if there is an url for this persons profile
+               if(isset($profile)) {
                        //create profile link
-                       $profile = str_replace(',','%2c',$profile);\r
-                       $newtag = '@[url=' . $profile . ']' . $newname  . '[/url]';\r
-                       $body = str_replace('@' . $name, $newtag, $body);\r
+                       $profile = str_replace(',','%2c',$profile);
+                       $newtag = '@[url=' . $profile . ']' . $newname  . '[/url]';
+                       $body = str_replace('@' . $name, $newtag, $body);
                        //append tag to str_tags
-                       if(! stristr($str_tags,$newtag)) {\r
-                               if(strlen($str_tags))\r
-                                       $str_tags .= ',';\r
-                               $str_tags .= $newtag;\r
-                       }\r
-       \r
-                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't\r
-                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.\r
-       \r
-                       if(strlen($alias)) {\r
-                               $newtag = '@[url=' . $alias . ']' . $newname    . '[/url]';\r
-                               if(! stristr($str_tags,$newtag)) {\r
-                                       if(strlen($str_tags))\r
-                                               $str_tags .= ',';\r
-                                       $str_tags .= $newtag;\r
-                               }\r
-                       }\r
-               }\r
+                       if(! stristr($str_tags,$newtag)) {
+                               if(strlen($str_tags))
+                                       $str_tags .= ',';
+                               $str_tags .= $newtag;
+                       }
+       
+                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't
+                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+       
+                       if(strlen($alias)) {
+                               $newtag = '@[url=' . $alias . ']' . $newname    . '[/url]';
+                               if(! stristr($str_tags,$newtag)) {
+                                       if(strlen($str_tags))
+                                               $str_tags .= ',';
+                                       $str_tags .= $newtag;
+                               }
+                       }
+               }
        }
 }

diff --git a/mod/network.php b/mod/network.php
index d0f1733f46120e5c6cec659491ddda9cc17b8398..9ec8c23b5904ed81850afb2ee8a8986e19b0c07c 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -90,7 +90,7 @@ function saved_searches($search) {
        $o = replace_macros($tpl, array(
                '$title'         => t('Saved Searches'),
                '$add'           => t('add'),
-               '$searchbox' => search($search,'netsearch-box',$a->get_baseurl(true) . $srchurl,true),
+               '$searchbox' => search($search,'netsearch-box',$srchurl,true),
                '$saved'         => $saved,
        ));