'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'
';
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
-
+
call_hooks("home_content",$o);
-
+
return $o;
-
-}}
+
+}}
diff --git a/mod/item.php b/mod/item.php
index 9be9de6688..a08d0e02b3 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -573,7 +573,7 @@ function item_post(&$a) {
if($fullnametagged)
continue;
- $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
+ $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
if($success['replaced'])
$tagged[] = $tag;
if(is_array($success['contact']) && intval($success['contact']['prv'])) {
@@ -1040,12 +1040,12 @@ function item_content(&$a) {
*
* @return boolean true if replaced, false if not replaced
*/
-function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
+function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
$replaced = false;
$r = null;
- //is it a hash tag?
+ //is it a hash tag?
if(strpos($tag,'#') === 0) {
//if the tag is replaced...
if(strpos($tag,'[url='))
@@ -1068,15 +1068,15 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
}
return $replaced;
}
- //is it a person tag?
+ //is it a person tag?
if(strpos($tag,'@') === 0) {
- //is it already replaced?
+ //is it already replaced?
if(strpos($tag,'[url='))
return $replaced;
$stat = false;
//get the person's name
$name = substr($tag,1);
- //is it a link or a full dfrn address?
+ //is it a link or a full dfrn address?
if((strpos($name,'@')) || (strpos($name,'http://'))) {
$newname = $name;
//get the profile links
@@ -1093,7 +1093,9 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
}
}
}
- } else { //if it is a name rather than an address
+ } 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;
@@ -1116,11 +1118,33 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
else {
$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)
- );
+ // 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
@@ -1179,10 +1203,10 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
$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)) {
@@ -1194,7 +1218,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
}
}
- return array('replaced' => $replaced, 'contact' => $r[0]);
+ return array('replaced' => $replaced, 'contact' => $r[0]);
}
diff --git a/object/Item.php b/object/Item.php
index 246fecc189..283381ef51 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -691,9 +691,8 @@ class Item extends BaseObject {
$this->wall_to_wall = false;
if($this->is_toplevel()) {
- if( (! $this->get_data_value('self')) && ($conv->get_mode() !== 'profile')) {
- if($this->get_data_value('wall')) {
-
+ if($conv->get_mode() !== 'profile') {
+ if($this->get_data_value('wall') AND !$this->get_data_value('self')) {
// On the network page, I am the owner. On the display page it will be the profile owner.
// This will have been stored in $a->page_contact by our calling page.
// Put this person as the wall owner of the wall-to-wall notice.
@@ -708,6 +707,7 @@ class Item extends BaseObject {
$owner_linkmatch = (($this->get_data_value('owner-link')) && link_compare($this->get_data_value('owner-link'),$this->get_data_value('author-link')));
$alias_linkmatch = (($this->get_data_value('alias')) && link_compare($this->get_data_value('alias'),$this->get_data_value('author-link')));
$owner_namematch = (($this->get_data_value('owner-name')) && $this->get_data_value('owner-name') == $this->get_data_value('author-name'));
+
if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
// The author url doesn't match the owner (typically the contact)
@@ -718,7 +718,7 @@ class Item extends BaseObject {
// well that it's the same Bob Smith.
// But it could be somebody else with the same name. It just isn't highly likely.
-
+
$this->owner_photo = $this->get_data_value('owner-avatar');
$this->owner_name = $this->get_data_value('owner-name');
diff --git a/view/global.css b/view/global.css
index f7b40ee8f9..1588d33939 100644
--- a/view/global.css
+++ b/view/global.css
@@ -44,7 +44,8 @@ span.connector {
.wall-item-container .wall-item-content .type-link img.attachment-image,
.type-link img.attachment-image, .type-video img.attachment-image {
- max-width: 640px;
+ /* max-width: 640px; */
+ max-width: 100%;
max-height: initial;
float: initial;
margin-right: 0px;
diff --git a/view/templates/follow.tpl b/view/templates/follow.tpl
index 7cd7c5c537..1df5cd86b0 100644
--- a/view/templates/follow.tpl
+++ b/view/templates/follow.tpl
@@ -7,7 +7,7 @@