diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 1 | ||||
| -rw-r--r-- | mod/dirprofile.php | 3 | ||||
| -rw-r--r-- | mod/display.php | 1 | ||||
| -rw-r--r-- | mod/network.php | 1 | ||||
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | mod/ping.php | 2 | ||||
| -rw-r--r-- | mod/search.php | 1 |
7 files changed, 10 insertions, 1 deletions
diff --git a/mod/channel.php b/mod/channel.php index 5d7c24206..205a89fa3 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -253,6 +253,7 @@ function channel_content(&$a, $update = 0, $load = false) { '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), '$search' => '', '$order' => '', + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$file' => '', '$cats' => (($category) ? $category : ''), '$mid' => $mid, diff --git a/mod/dirprofile.php b/mod/dirprofile.php index ba056e864..0cd84b910 100644 --- a/mod/dirprofile.php +++ b/mod/dirprofile.php @@ -70,6 +70,8 @@ function dirprofile_init(&$a) { $profile_link = chanlink_url($rr['url']); $pdesc = (($rr['description']) ? $rr['description'] . '<br />' : ''); + + $qrlink = zid($rr['url']); $connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); if(in_array($rr['hash'],$contacts)) @@ -145,6 +147,7 @@ function dirprofile_init(&$a) { $entry = replace_macros(get_markup_template('direntry_large.tpl'), array( '$id' => ++$t, '$profile_link' => $profile_link, + '$qrlink' => $qrlink, '$photo' => $rr['photo_l'], '$alttext' => $rr['name'] . ' ' . $rr['address'], '$name' => $rr['name'], diff --git a/mod/display.php b/mod/display.php index 65114272a..b20eb3e4f 100644 --- a/mod/display.php +++ b/mod/display.php @@ -125,6 +125,7 @@ function display_content(&$a, $update = 0, $load = false) { '$nouveau' => '0', '$wall' => '0', '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$search' => '', '$order' => '', '$file' => '', diff --git a/mod/network.php b/mod/network.php index 7f67f62d0..191fe55ed 100644 --- a/mod/network.php +++ b/mod/network.php @@ -237,6 +237,7 @@ function network_content(&$a, $update = 0, $load = false) { '$spam' => (($spam) ? $spam : '0'), '$nouveau' => (($nouveau) ? $nouveau : '0'), '$wall' => '0', + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), '$search' => (($search) ? $search : ''), '$order' => $order, diff --git a/mod/photos.php b/mod/photos.php index 4a0fb01b8..51a680828 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -854,6 +854,8 @@ function photos_content(&$a) { '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext, '$imgalt' => $imgalt_e, '$desc'=> $desc_e, + '$ext' => $ext, + '$hash'=> $rr['resource_id'], )); } diff --git a/mod/ping.php b/mod/ping.php index a0938cb15..dda87dec2 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -209,7 +209,7 @@ function ping_init(&$a) { if($r) { foreach($r as $rr) { $result[] = array( - 'notify_link' => $a->get_baseurl() . '/connections/' . $rr['abook_id'], + 'notify_link' => $a->get_baseurl() . '/connedit/' . $rr['abook_id'], 'name' => $rr['xchan_name'], 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], diff --git a/mod/search.php b/mod/search.php index 32c8ca38e..d13c613c2 100644 --- a/mod/search.php +++ b/mod/search.php @@ -96,6 +96,7 @@ function search_content(&$a,$update = 0, $load = false) { '$spam' => '0', '$nouveau' => '0', '$wall' => '0', + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), '$search' => (($tag) ? urlencode('#') : '') . $search, '$order' => '', |