aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-05 18:20:37 -0800
committerfriendica <info@friendica.com>2013-11-05 18:20:37 -0800
commit5c71ccba987f1d83482025508b356a22dcf5151c (patch)
tree3588a0bd6e3de0d71c3f1a17f9d221274c234c38
parent5b3adf7755f7bd648c97969ec8b0183797bb2722 (diff)
downloadvolse-hubzilla-5c71ccba987f1d83482025508b356a22dcf5151c.tar.gz
volse-hubzilla-5c71ccba987f1d83482025508b356a22dcf5151c.tar.bz2
volse-hubzilla-5c71ccba987f1d83482025508b356a22dcf5151c.zip
add shameless plug if they've not got zot, and add photo favicon to photos pages
-rwxr-xr-xboot.php8
-rw-r--r--mod/photos.php2
2 files changed, 8 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 99ec5de32..e2129f6f5 100755
--- a/boot.php
+++ b/boot.php
@@ -1530,8 +1530,14 @@ function remote_user() {
function notice($s) {
$a = get_app();
if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
- if($a->interactive)
+ if($a->interactive) {
+ // shameless plug, permission is denied and they have no identity.
+ // There's a fairly good chance that they've not got zot.
+ if((stristr($s,t('permission denied'))) && (! get_observer_hash())) {
+ $s .= '<br /><a href="http://getzot.com">' . t('Got Zot?') . '</a>';
+ }
$_SESSION['sysmsg'][] = $s;
+ }
}
diff --git a/mod/photos.php b/mod/photos.php
index 075d01cf2..fe5777fe9 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -36,7 +36,7 @@ function photos_init(&$a) {
$a->set_widget('vcard',vcard_from_xchan($a->data['channel'],$observer));
-
+ head_set_icon($a->data['channel']['xchan_photo_s']);
if($a->data['perms']['view_photos']) {
$a->data['albums'] = photos_albums_list($a->data['channel'],$observer);
$a->set_widget('photo_albums',photos_album_widget($a->data['channel'],$observer,$a->data['albums']));