Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging

Browse source 
Conflicts:
	mod/profiles.php
This commit is contained in:
friendica 2015-01-13 18:07:49 -08:00
commit 111bbe65d9
9 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/identity.php
View file

@ -1205,21 +1205,9 @@ function advanced_profile(&$a) {
if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
// Support tags in the other channels field (probably want to restrict it to channels only?)
$txt = $a->profile['channels'];
$matches = get_tags($txt);
$access_tag = '';
$str_tags = '';
foreach($matches as $m) {
$success = handle_tag($a, $txt, $access_tag, $str_tags, $a->profile_uid, $m); // Use uid of the profile maker
}
if($txt = prepare_text($txt)) {
$profile['channels'] = array( t('My other channels:'), $txt);
}
if($txt = prepare_text($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);

2
include/text.php
View file

@ -2351,7 +2351,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]);
}
function linkify_tags($a, &$body, $uid, $profile_uid) {
function linkify_tags($a, &$body, $uid) {
$str_tags = '';
$tagged = array();
$result = array();

2
mod/admin.php
View file

@ -288,6 +288,8 @@ function admin_page_site_post(&$a){
del_config('system','admininfo');
}
else {
require_once('include/text.php');
linkify_tags($a, $admininfo, local_user());
set_config('system','admininfo', $admininfo);
}
set_config('system','language', $language);

4
mod/events.php
View file

@ -75,6 +75,10 @@ function events_post(&$a) {
$location = escape_tags(trim($_POST['location']));
$type = 'event';
require_once('include/text.php');
linkify_tags($a, $desc, local_user());
linkify_tags($a, $location, local_user());
$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
$onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
if(strcmp($finish,$start) < 0 && !$nofinish) {

2
mod/item.php
View file

@ -576,7 +576,7 @@ function item_post(&$a) {
// Look for tags and linkify them
$results = linkify_tags($a, $body, $uid, $profile_uid);
$results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid);
// Set permissions based on tag replacements
set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item);

3
mod/mail.php
View file

@ -83,6 +83,9 @@ function mail_post(&$a) {
// $body = fix_mce_lf($body);
// }
require_once('include/text.php');
linkify_tags($a, $body, local_user());
if(! $recipient) {
notice('No recipient found.');
$a->argc = 2;

2
mod/photos.php
View file

@ -354,7 +354,7 @@ function photos_post(&$a) {
require_once('include/text.php');
$profile_uid = $a->profile['profile_uid'];
$results = linkify_tags($a, $rawtags, local_user(), $profile_uid);
$results = linkify_tags($a, $rawtags, (local_user()) ? local_user() : $profile_uid);
$success = $results['success'];
$post_tags = array();

17
mod/profiles.php
View file

@ -298,6 +298,23 @@ function profiles_post(&$a) {
$hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0);
require_once('include/text.php');
linkify_tags($a, $likes, local_user());
linkify_tags($a, $dislikes, local_user());
linkify_tags($a, $about, local_user());
linkify_tags($a, $interest, local_user());
linkify_tags($a, $interest, local_user());
linkify_tags($a, $contact, local_user());
linkify_tags($a, $channels, local_user());
linkify_tags($a, $music, local_user());
linkify_tags($a, $book, local_user());
linkify_tags($a, $tv, local_user());
linkify_tags($a, $film, local_user());
linkify_tags($a, $romance, local_user());
linkify_tags($a, $work, local_user());
linkify_tags($a, $education, local_user());
$with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : '');
if(! strlen($howlong))

3
mod/siteinfo.php
View file

@ -126,7 +126,8 @@ function siteinfo_content(&$a) {
else
$plugins_text = t('No installed plugins/addons/apps');
$admininfo = bbcode(get_config('system','admininfo'));
$txt = get_config('system','admininfo');
$admininfo = bbcode($txt);
if(file_exists('doc/site_donate.html'))
$donate .= file_get_contents('doc/site_donate.html');