diff options
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | include/Contact.php | 7 | ||||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | view/search_item.tpl | 4 | ||||
| -rw-r--r-- | view/wall_item.tpl | 4 | ||||
| -rw-r--r-- | view/wallwall_item.tpl | 6 |
6 files changed, 19 insertions, 10 deletions
@@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1097' ); +define ( 'FRIENDIKA_VERSION', '2.2.1098' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1087 ); @@ -1013,7 +1013,7 @@ function get_birthdays() { $now = strtotime('now'); $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); - $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" href="' + $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" target="redir" href="' . $a->get_baseurl() . '/redir/' . $rr['cid'] . '">' . $rr['name'] . '</a> ' . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '') . '</div>' ; diff --git a/include/Contact.php b/include/Contact.php index 7524c0cea..45920041e 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -133,7 +133,12 @@ function contact_photo_menu($contact) { $o = ""; foreach($menu as $k=>$v){ - if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n"; + if ($v!="") { + if(($k !== t("View recent")) && ($k !== t("Send PM"))) + $o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n"; + else + $o .= "<li><a href=\"$v\">$k</a></li>\n"; + } } return $o; }} diff --git a/include/text.php b/include/text.php index e3d984a1f..536c998de 100644 --- a/include/text.php +++ b/include/text.php @@ -571,11 +571,13 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $url = $contact['url']; $sparkle = ''; + $redir = false; if($redirect) { $a = get_app(); $redirect_url = $a->get_baseurl() . '/redir/' . $contact['id']; if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === 'dfrn')) { + $redir = true; $url = $redirect_url; $sparkle = ' sparkle'; } @@ -586,6 +588,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($textmode) { return '<div class="contact-block-textdiv' . $class . '"><a class="contact-block-link' . $class . $sparkle . (($click) ? ' fakelink' : '') . '" ' + . (($redir) ? ' target="redir" ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] . '" >'. $contact['name'] . '</a></div>' . "\r\n"; @@ -593,6 +596,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { else { return '<div class="contact-block-div' . $class . '"><a class="contact-block-link' . $class . $sparkle . (($click) ? ' fakelink' : '') . '" ' + . (($redir) ? ' target="redir" ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="' . $contact['micro'] . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] . '" /></a></div>' . "\r\n"; diff --git a/view/search_item.tpl b/view/search_item.tpl index 72246e68c..e045fc328 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -4,7 +4,7 @@ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> - <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a> <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id"> @@ -20,7 +20,7 @@ </div> </div> <div class="wall-item-author"> - <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> </div> diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 1c5e82b17..3db3b1507 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -4,7 +4,7 @@ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> - <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /> </a> <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span> @@ -21,7 +21,7 @@ </div> </div> <div class="wall-item-author"> - <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> </div> diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index fd686f0f4..cac036d06 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -2,14 +2,14 @@ <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > <div class="wall-item-info wallwall" id="wall-item-info-$id"> <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" > - <a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id"> + <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id"> <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a> </div> <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div> <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> - <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a> <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id"> @@ -26,7 +26,7 @@ </div> </div> <div class="wall-item-author"> - <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br /> + <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br /> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> </div> <div class="wall-item-content" id="wall-item-content-$id" > |