diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/apps.php | 14 | ||||
| -rw-r--r-- | mod/dfrn_request.php | 8 | ||||
| -rw-r--r-- | mod/events.php | 5 | ||||
| -rw-r--r-- | mod/follow.php | 3 | ||||
| -rw-r--r-- | mod/photos.php | 12 | ||||
| -rw-r--r-- | mod/salmon.php | 5 |
6 files changed, 29 insertions, 18 deletions
diff --git a/mod/apps.php b/mod/apps.php index 58752de32..f25722df7 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -5,10 +5,20 @@ function apps_content(&$a) { $o .= '<h3>' . t('Applications') . '</h3>'; - $o .= '<div class="app-title"><a href="notes">' . t('Private Notes') . '</a></div>'; + $apps = false; - if($a->apps) + if(local_user()) { + $apps = true; + $o .= '<div class="app-title"><a href="notes">' . t('Private Notes') . '</a></div>'; + } + + if($a->apps) { + $apps = true; $o .= $a->apps; + } + + if(! $apps) + notice( t('No installed applications.') . EOL); return $o; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 338dc9cf1..c9811fa60 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -626,11 +626,9 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); - $prv = get_config('system','strict_privacy'); - $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), - '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''), + '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'), '$pls_answer' => t('Please answer the following:'), '$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']), '$yes' => t('Yes'), @@ -638,9 +636,9 @@ function dfrn_request_content(&$a) { '$add_note' => t('Add a personal note:'), '$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"), '$friendika' => t('Friendika'), - '$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''), + '$statusnet' => t('StatusNet/Federated Social Web'), '$private_net' => t("Private \x28secure\x29 network"), - '$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''), + '$public_net' => t("Public \x28insecure\x29 network"), '$your_address' => t('Your Identity Address:'), '$submit' => t('Submit Request'), '$cancel' => t('Cancel'), diff --git a/mod/events.php b/mod/events.php index f19a438fd..af829c28d 100644 --- a/mod/events.php +++ b/mod/events.php @@ -54,6 +54,9 @@ function events_post(&$a) { $str_contact_deny = perms2str($_POST['contact_deny']); + // until publishing is ready + $str_contact_allow = '<' . local_user() . '>'; + if($event_id) { $r = q("UPDATE `event` SET `edited` = '%s', @@ -169,7 +172,7 @@ function events_content(&$a) { $prevyear --; } - + $o .= '<div id="new-event-link"><a href="' . $a->get_baseurl() . '/events/new' . '" >' . t('Create New Event') . '</a></div>'; $o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal">' . t('<< Previous') . '</a> | <a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal">' . t('Next >>') . '</a>'; $o .= cal($y,$m,false, ' eventcal'); diff --git a/mod/follow.php b/mod/follow.php index 31cfcfb64..a354b3457 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -34,9 +34,6 @@ function follow_post(&$a) { // NOTREACHED } - elseif(get_config('system','strict_privacy')) { - unset($ret['notify']); - } // do we have enough information? diff --git a/mod/photos.php b/mod/photos.php index f1a2d635c..18fff703e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -510,8 +510,15 @@ foreach($_FILES AS $key => $val) { $arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="image/jpeg" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '" />') . '</link></target>'; $item_id = item_store($arr); - if($item_id) + if($item_id) { + q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", + dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id), + intval($page_owner_uid), + intval($item_id) + ); + proc_run('php',"include/notifier.php","tag","$item_id"); + } } } @@ -1106,9 +1113,10 @@ function photos_content(&$a) { $tag_str .= bbcode($t); } $tags = array(t('Tags: '), $tag_str); - if($cmd === 'edit') + if($cmd === 'edit') { $tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id']; $tags[] = t('[Remove any tag]'); + } } diff --git a/mod/salmon.php b/mod/salmon.php index bf33033d8..c2f76aa0a 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -192,11 +192,6 @@ function salmon_post(&$a) { // NOTREACHED } - // Check if we're allowed to talk to insecure networks - - if(get_config('system','strict_privacy')) - salmon_return(400); - require_once('include/items.php'); // Placeholder for hub discovery. We shouldn't find any hubs |