diff options
| -rw-r--r-- | mod/connections.php | 2 | ||||
| -rw-r--r-- | mod/magic.php | 12 | ||||
| -rw-r--r-- | mod/nogroup.php | 2 | ||||
| -rw-r--r-- | mod/viewconnections.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/tpl/contact_template.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/smarty3/contact_template.tpl | 2 |
7 files changed, 18 insertions, 6 deletions
diff --git a/mod/connections.php b/mod/connections.php index 8e002d870..c98709470 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -594,7 +594,7 @@ function connections_content(&$a) { 'name' => $rr['xchan_name'], 'username' => $rr['xchan_name'], 'sparkle' => $sparkle, - 'edit' => z_root() . '/connections/' . $rr['abook_id'], + 'link' => z_root() . '/connections/' . $rr['abook_id'], 'url' => $rr['xchan_url'], 'network' => network_to_name($rr['network']), ); diff --git a/mod/magic.php b/mod/magic.php index ba9e69a49..0f9a66c5b 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -60,6 +60,18 @@ function magic_init(&$a) { return; } + $arr = array( + 'channel_id' => local_user(), + 'xchan' => $x[0], + 'destination' => $dest, + 'proceed' => true + ); + + call_hooks('magic_auth',$arr); + $dest = $arr['destination']; + if(! $arr['proceed']) + goaway($dest); + if($x[0]['hubloc_url'] === z_root()) { $webbie = substr($x[0]['hubloc_addr'],0,strpos('@',$x[0]['hubloc_addr'])); switch($dest) { diff --git a/mod/nogroup.php b/mod/nogroup.php index bd1ec82ed..31ccaadbf 100644 --- a/mod/nogroup.php +++ b/mod/nogroup.php @@ -48,7 +48,7 @@ function nogroup_content(&$a) { 'username' => $rr['name'], 'sparkle' => $sparkle, 'itemurl' => $rr['url'], - 'url' => $url, + 'link' => $url, 'network' => network_to_name($rr['network']), ); } diff --git a/mod/viewconnections.php b/mod/viewconnections.php index e6c739562..a08723ba2 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -70,7 +70,7 @@ function viewconnections_content(&$a) { 'thumb' => $rr['xchan_photo_m'], 'name' => substr($rr['xchan_name'],0,20), 'username' => $rr['xchan_addr'], - 'url' => $url, + 'link' => $url, 'sparkle' => '', 'itemurl' => $rr['url'], 'network' => '', diff --git a/version.inc b/version.inc index c07f843b6..e6ae4dac0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-02-19.229 +2013-02-20.230 diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl index 7bdcd6b93..905892d9f 100644 --- a/view/tpl/contact_template.tpl +++ b/view/tpl/contact_template.tpl @@ -1,7 +1,7 @@ <div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" > <div class="contact-entry-photo-wrapper" > - <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" alt="$contact.name" /></a> + <a href="$contact.link" title="$contact.img_hover" /><img src="$contact.thumb" alt="$contact.name" /></a> </div> <div class="contact-entry-photo-end" ></div> <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div> diff --git a/view/tpl/smarty3/contact_template.tpl b/view/tpl/smarty3/contact_template.tpl index 496fb90ba..ee8dac10d 100644 --- a/view/tpl/smarty3/contact_template.tpl +++ b/view/tpl/smarty3/contact_template.tpl @@ -6,7 +6,7 @@ <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > <div class="contact-entry-photo-wrapper" > - <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> + <a href="{{$contact.link}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> </div> <div class="contact-entry-photo-end" ></div> <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div> |