From 42d5d515b25e1bf0068da6bbf4ffef2374f02617 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Jul 2013 16:55:57 -0700 Subject: [PATCH 01/15] birthday error checking - if year is present but no month or day, set to 1 January. Otherwise the date will be set to 30 November the prior year due to how the PHP strtotime() function works. --- mod/profiles.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mod/profiles.php b/mod/profiles.php index 28d8dd973..173d97138 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -200,6 +200,11 @@ function profiles_post(&$a) { $day = intval($_POST['day']); if(($day > $mtab[$month]) || ($day < 0)) $day = 0; + + if($year && (! ($month && $day))) { + $month = 1; $day = 1; + } + $dob = '0000-00-00'; $dob = sprintf('%04d-%02d-%02d',$year,$month,$day); From 1af5ecf1af7111020d99a7f274e7fed2bbc663f1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Jul 2013 17:22:40 -0700 Subject: [PATCH 02/15] tag cloud tweaking - allow your own comments, disallow all private posts --- include/taxonomy.php | 19 ++++++++++++++----- mod/channel.php | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/include/taxonomy.php b/include/taxonomy.php index e9cc0faf4..6b7987ba6 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -96,14 +96,23 @@ function format_term_for_display($term) { // Tag cloud functions - need to be adpated to this database format -function tagadelic($uid, $count = 0, $flags = 0, $type = TERM_HASHTAG) { +function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $type = TERM_HASHTAG) { + + $sql_options = ''; if($flags) - $sql_options = " and ((item_flags & " . intval($flags) . ") = " . intval($flags) . ") "; + $sql_options .= " and ((item_flags & " . intval($flags) . ") = " . intval($flags) . ") "; + if($authors) { + if(! is_array($authors)) + $authors = array($authors); + stringify_array_elms($authors,true); + $sql_options .= " and author_xchan in (" . implode(',',$authors) . ") "; + } + // Fetch tags $r = q("select term, count(term) as total from term left join item on term.oid = item.id where term.uid = %d and term.type = %d - and otype = %d and item_restrict = 0 + and otype = %d and item_restrict = 0 and item_private = 0 $sql_options group by term order by total desc %s", intval($uid), @@ -148,10 +157,10 @@ function tags_sort($a,$b) { } -function tagblock($link,$uid,$count = 0,$flags = 0,$type = TERM_HASHTAG) { +function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$type = TERM_HASHTAG) { $o = ''; $tab = 0; - $r = tagadelic($uid,$count,$flags,$type); + $r = tagadelic($uid,$count,$authors,$flags,$type); if($r) { $o = '

' . t('Tags') . '

'; diff --git a/mod/channel.php b/mod/channel.php index 5d4c7ce1b..c7b631c96 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -48,7 +48,7 @@ function channel_aside(&$a) { $a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['channel_address'],$cat)); } if(feature_enabled($a->profile['profile_uid'],'tagadelic')) - $a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,ITEM_WALL|ITEM_THREAD_TOP)); + $a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,$a->profile['channel_hash'],ITEM_WALL)); } From 8ec5f8b07a0f1d5ad266bfdfdfb48d4f5647eed6 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Jul 2013 19:30:52 -0700 Subject: [PATCH 03/15] $yoursite/thing?f=&verb=has&term=big+balls These will eventually be listed by category in your profile and you will be able to have different lists in different profiles (which is why the multi-profile feature needed to get finished before I could get any further along on this...) have fun --- include/taxonomy.php | 15 +++++ mod/thing.php | 130 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 134 insertions(+), 11 deletions(-) diff --git a/include/taxonomy.php b/include/taxonomy.php index 6b7987ba6..1ccb18b47 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -171,3 +171,18 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$type = TERM_HA } return $o; } + + +function obj_verbs() { + $verbs = array( + 'has' => array( t('have'), t('has')), + 'wants' => array( t('want'), t('wants')), + 'likes' => array( t('like'), t('likes')), + 'dislikes' => array( t('dislike'), t('dislikes')), + ); + + $arr = array('verbs' => $verbs); + call_hooks('obj_verbs', $arr); + return $arr['verbs']; +} + diff --git a/mod/thing.php b/mod/thing.php index 723b069bc..9cd0f519f 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -1,5 +1,6 @@ get_account(); + $channel = $a->get_channel(); + $name = escape_tags($_REQUEST['term']); + $verb = escape_tags($_REQUEST['verb']); + $profile = escape_tags($_REQUEST['profile']); $url = $_REQUEST['link']; $photo = $_REQUEST['photo']; $hash = random_string(); - if(! $name) + $verbs = obj_verbs(); + + /** + * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" + * We use the first person form when creating an activity, but the third person for use in activities + * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually + * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module. + */ + + $translated_verb = $verbs[$verb][1]; + + /** + * Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators + * That needs to be specified in your thing. e.g. Mike has "a carrot", Greg wants "balls", Bob likes "the Boston Red Sox". + */ + + /** + * Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache + * and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile. + */ + + if((! $name) || (! $translated_verb)) return; - $r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash ) - values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ", - intval($account_id), + if(! $profile) { + $r = q("select profile_guid from profile where is_default = 1 and uid = %d limit 1", + intval(local_user()) + ); + if($r) + $profile = $r[0]['profile_guid']; + } + + if(! $profile) + return; + + + $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1", intval(local_user()), - 0, - TERM_OBJ_THING, - TERM_THING, - dbesc($name), - dbesc(($url) ? $url : z_root() . '/thing/' . $hash), - dbesc(($photo) ? $photo : ''), - dbesc($hash) + intval(TERM_OBJ_THING), + intval(TERM_THING), + dbesc($name) ); + if(! $r) { + $r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash ) + values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ", + intval($account_id), + intval(local_user()), + 0, + intval(TERM_OBJ_THING), + intval(TERM_THING), + dbesc($name), + dbesc(($url) ? $url : z_root() . '/thing/' . $hash), + dbesc(($photo) ? $photo : ''), + dbesc($hash) + ); + $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1", + intval(local_user()), + intval(TERM_OBJ_THING), + intval(TERM_THING), + dbesc($name) + ); + } + $term = $r[0]; + + $r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel) values ('%s','%s', %d,%d) ", + dbesc($profile), + dbesc($verb), + intval(TERM_OBJ_THING), + intval(local_user()) + ); + + if(! $r) { + notice('Object store: failed'); + return; + } + + + $arr = array(); + $links = array(array('rel' => 'alternate','type' => 'text/html', + 'href' => $term['url'])); + + $objtype = ACTIVITY_OBJ_THING; + + $obj = json_encode(array( + 'type' => $objtype, + 'id' => $term['url'], + 'link' => $links, + 'title' => $term['term'], + 'content' => $term['term'] + )); + + $bodyverb = str_replace('OBJ: ', '',t('OBJ: %1$s %2$s %3$s')); + + $arr['owner_xchan'] = $channel['channel_hash']; + $arr['author_xchan'] = $channel['channel_hash']; + + + $arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP; + + $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; + $plink = '[zrl=' . $term['url'] . ']' . $term['term'] . '[/zrl]'; + + $arr['body'] = sprintf( $bodyverb, $ulink, $translated_verb, $plink ); + + $arr['verb'] = $verb; + $arr['obj_type'] = $objtype; + $arr['object'] = $obj; + + $ret = post_activity_item($arr); + + if($ret['success']) + proc_run('php','include/notifier.php','tag',$ret['activity']['id']); } function thing_content(&$a) { + + /* placeholders */ + if(argc() > 1) { + return t('not yet implemented.'); + } + goaway(z_root() . '/network'); } From fbdee83dca4aa9e5d66488f32121d8c62e378316 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Jul 2013 20:37:39 -0700 Subject: [PATCH 04/15] some object/thing tweaks --- boot.php | 2 +- include/taxonomy.php | 10 ++++++++++ index.php | 7 +++++-- mod/thing.php | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index b15f20d12..bf99c142e 100755 --- a/boot.php +++ b/boot.php @@ -1930,7 +1930,7 @@ function current_theme(){ function current_theme_url($installing = false) { global $a; $t = current_theme(); - if((file_exists('view/theme/' . $t . '/php/style.php')) && (! $installing)) + if(file_exists('view/theme/' . $t . '/php/style.php')) return('view/theme/' . $t . '/php/style.pcss'); return('view/theme/' . $t . '/css/style.css'); } diff --git a/include/taxonomy.php b/include/taxonomy.php index 1ccb18b47..70c2ad3e0 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -173,6 +173,15 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$type = TERM_HA } + /** + * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" + * We use the first person form when creating an activity, but the third person for use in activities + * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually + * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module. + */ + + + function obj_verbs() { $verbs = array( 'has' => array( t('have'), t('has')), @@ -186,3 +195,4 @@ function obj_verbs() { return $arr['verbs']; } + diff --git a/index.php b/index.php index 08943e4b7..14b8ca856 100755 --- a/index.php +++ b/index.php @@ -118,8 +118,11 @@ if(! x($_SESSION,'sysmsg_info')) */ -if($install) - $a->module = 'setup'; +if($install) { + /* Allow an exception for the view module so that pcss will be interpreted during installation */ + if($a->module != 'view') + $a->module = 'setup'; +} else check_config($a); diff --git a/mod/thing.php b/mod/thing.php index 9cd0f519f..8ecf00d01 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -31,6 +31,20 @@ function thing_init(&$a) { */ $translated_verb = $verbs[$verb][1]; + + /** + * The site administrator can do things that normals cannot. + * This is restricted because it will likely cause + * an activitystreams protocol violation and the activity might + * choke in some other network and result in unnecessary + * support requests. It isn't because we're trying to be heavy-handed + * about what you can and can't do. + */ + + if(! $translated_verb) { + if(is_site_admin()) + $translated_verb = $verb; + } /** * Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators From 6f390330ff45c2b636a20c2c4e32e70c74523d6a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Jul 2013 22:51:49 -0700 Subject: [PATCH 05/15] nearly ready for the output template --- include/profile_advanced.php | 21 +++++++++++++++++++++ mod/thing.php | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/include/profile_advanced.php b/include/profile_advanced.php index f008d1c8f..e113e019d 100644 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php @@ -80,9 +80,30 @@ function advanced_profile(&$a) { if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt ); + $r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_page = '%s' and uid = %d and obj_type = %d + order by obj_verb, term", + dbesc($a->profile['profile_guid']), + intval($a->profile['profile_uid']), + intval(TERM_OBJ_THING) + ); + + $things = null; + + if($r) { + $things = array(); + foreach($r as $rr) { + if(! $things[$rr['obj_verb']]) + $things[$rr['obj_verb']] = array(); + $things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl']); + } + } + + logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); + return replace_macros($tpl, array( '$title' => t('Profile'), '$profile' => $profile, + '$things' => $things )); } diff --git a/mod/thing.php b/mod/thing.php index 8ecf00d01..6df4aa3b6 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -99,11 +99,12 @@ function thing_init(&$a) { } $term = $r[0]; - $r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel) values ('%s','%s', %d,%d) ", + $r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj) values ('%s','%s', %d, %d, '%s') ", dbesc($profile), dbesc($verb), intval(TERM_OBJ_THING), - intval(local_user()) + intval(local_user()), + dbesc($term['term_hash']) ); if(! $r) { From ec38f1d5dbe75ee8bb66a904414266a7391412d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Jul 2013 23:08:56 -0700 Subject: [PATCH 06/15] first template --- view/tpl/profile_advanced.tpl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index f8743c011..8075b0bb6 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -170,6 +170,17 @@ {{/if}} - +{{if $things}} +{{foreach $things as $key => $items}} +{{$profile.fullname.1}} {{$key}} +
    +{{foreach $items as $item}} +
  • {{if $item.img}}{{$item.term}}{{/if}} +{{$item.term}} +
    • +{{/foreach}} +
+{{/foreach}} +{{/if}} From 2979a2ee5a3a820bdc6ccbda173a5e5016d570db Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Jul 2013 04:53:03 -0700 Subject: [PATCH 07/15] more "thing" work --- include/profile_advanced.php | 18 ++++++++++++++++-- version.inc | 2 +- view/theme/redbasic/css/style.css | 10 ++++++++++ view/tpl/profile_advanced.tpl | 1 + 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/include/profile_advanced.php b/include/profile_advanced.php index e113e019d..21606185d 100644 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php @@ -91,19 +91,33 @@ function advanced_profile(&$a) { if($r) { $things = array(); + + // Use the system obj_verbs array as a sort key, since we don't really + // want an alphabetic sort. To change the order, use a plugin to + // alter the obj_verbs() array or alter it in code. Unknown verbs come + // after the known ones - in no particular order. + + $v = obj_verbs(); + foreach($v as $k => $foo) + $things[$k] = null; foreach($r as $rr) { if(! $things[$rr['obj_verb']]) $things[$rr['obj_verb']] = array(); $things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl']); } + $sorted_things = array(); + if($things) + foreach($things as $k => $v) + if(is_array($things[$k])) + $sorted_things[$k] = $v; } - logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); + logger('mod_profile: things: ' . print_r($sorted_things,true), LOGGER_DATA); return replace_macros($tpl, array( '$title' => t('Profile'), '$profile' => $profile, - '$things' => $things + '$things' => $sorted_things )); } diff --git a/version.inc b/version.inc index 3e4010a3d..7fb3a18be 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-07-03.363 +2013-07-04.364 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b1509c34f..16c614cff 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3881,3 +3881,13 @@ width: 200px; .tag10 { font-size : 2.8em !important; } + +.profile-thing-list { + list-style-type: none; +} +/* +.profile-thing-list li { + float: left; + margin-right: 25px; +} +*/ \ No newline at end of file diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 8075b0bb6..0d1750085 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -180,6 +180,7 @@ {{/foreach}} +
{{/foreach}} {{/if}} From 08258da9444a94708426cf2d445e60b21dbbe84a Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Jul 2013 15:46:20 -0700 Subject: [PATCH 08/15] fix undefined commentWrap --- js/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index 161068310..9eb9c7946 100644 --- a/js/main.js +++ b/js/main.js @@ -351,9 +351,12 @@ function updateConvItems(mode,data) { var ident = $(this).attr('id'); var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = commentWrap.replace('collapsed-comments-',''); + var itmId = 0; var isVisible = false; + if(typeof commentWrap !== 'undefined') + itmId = commentWrap.replace('collapsed-comments-',''); + if($('#' + ident).length == 0 && profile_page == 1) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); From 8b9f2f8ef766c169e77a34c72118d14beb2b21de Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Jul 2013 20:35:42 -0700 Subject: [PATCH 09/15] input form for profile stuff --- include/taxonomy.php | 10 +++++++ mod/thing.php | 56 ++++++++++++++++++++++++++++++---------- view/css/mod_thing.css | 27 +++++++++++++++++++ view/tpl/thing_input.tpl | 28 ++++++++++++++++++++ 4 files changed, 108 insertions(+), 13 deletions(-) create mode 100644 view/css/mod_thing.css create mode 100644 view/tpl/thing_input.tpl diff --git a/include/taxonomy.php b/include/taxonomy.php index 70c2ad3e0..b6803743a 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -196,3 +196,13 @@ function obj_verbs() { } +function obj_verb_selector() { + $verbs = obj_verbs(); + $o .= ''; + return $o; + +} \ No newline at end of file diff --git a/mod/thing.php b/mod/thing.php index 6df4aa3b6..91bdca78a 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -14,7 +14,7 @@ function thing_init(&$a) { $name = escape_tags($_REQUEST['term']); $verb = escape_tags($_REQUEST['verb']); - $profile = escape_tags($_REQUEST['profile']); + $profile_guid = escape_tags($_REQUEST['profile']); $url = $_REQUEST['link']; $photo = $_REQUEST['photo']; @@ -59,15 +59,13 @@ function thing_init(&$a) { if((! $name) || (! $translated_verb)) return; - if(! $profile) { - $r = q("select profile_guid from profile where is_default = 1 and uid = %d limit 1", - intval(local_user()) - ); - if($r) - $profile = $r[0]['profile_guid']; - } - - if(! $profile) + $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 "); + $p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1", + intval(local_user()) + ); + if($p) + $profile = $p[0]; + else return; @@ -100,7 +98,7 @@ function thing_init(&$a) { $term = $r[0]; $r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj) values ('%s','%s', %d, %d, '%s') ", - dbesc($profile), + dbesc($profile['profile_guid']), dbesc($verb), intval(TERM_OBJ_THING), intval(local_user()), @@ -108,10 +106,11 @@ function thing_init(&$a) { ); if(! $r) { - notice('Object store: failed'); + notice( t('Object store: failed')); return; } + info( t('thing/stuff added')); $arr = array(); $links = array(array('rel' => 'alternate','type' => 'text/html', @@ -143,6 +142,22 @@ function thing_init(&$a) { $arr['verb'] = $verb; $arr['obj_type'] = $objtype; $arr['object'] = $obj; + + if(! $profile['is_default']) { + $arr['item_private'] = true; + $str = ''; + $r = q("select abook_hash from abook where abook_channel = %d and abook_profile = '%s'", + intval(local_user()), + dbesc($profile_guid) + ); + if($r) { + $arr['allow_cid'] = ''; + foreach($r as $rr) + $arr['allow_cid'] .= '<' . $rr['abook_hash'] . '>'; + } + else + $arr['allow_cid'] = '<' . get_observer_hash() . '>'; + } $ret = post_activity_item($arr); @@ -160,7 +175,22 @@ function thing_content(&$a) { return t('not yet implemented.'); } - goaway(z_root() . '/network'); + require_once('include/contact_selectors.php'); + + $o .= replace_macros(get_markup_template('thing_input.tpl'),array( + '$thing_hdr' => t('Add Stuff to your Profile'), + '$multiprof' => feature_enabled(local_user(),'multi_profiles'), + '$profile_lbl' => t('Select a profile'), + '$profile_select' => contact_profile_assign(''), + '$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'), + '$verb_select' => obj_verb_selector(), + '$thing_lbl' => t('Name of thing or stuff e.g. something'), + '$url_lbl' => t('URL of thing or stuff (optional)'), + '$img_lbl' => t('URL for photo of thing or stuff (optional)'), + '$submit' => t('Submit') + )); + + return $o; } diff --git a/view/css/mod_thing.css b/view/css/mod_thing.css new file mode 100644 index 000000000..2a2ba7c92 --- /dev/null +++ b/view/css/mod_thing.css @@ -0,0 +1,27 @@ + + +.thing-profile #contact-profile-selector { + margin-left: 0; +} + +.thing-verb-label { + margin-top: 15px; +} + +.thing-verb { + margin-bottom: 15px; +} + +.thing-label { + float: left; + width: 250px; +} + +.thing-input { + float: left; + margin-bottom: 15px; +} + +.thing-field-end { + clear: both; +} \ No newline at end of file diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl new file mode 100644 index 000000000..06cbfe917 --- /dev/null +++ b/view/tpl/thing_input.tpl @@ -0,0 +1,28 @@ +

{{$thing_hdr}}

+
+ +{{if $multiprof }} +
{{$profile_lbl}}
+ +
{{$profile_select}}
+{{/if}} + +
{{$verb_lbl}}
+ +
{{$verb_select}}
+ + + + +
+ + +
+ + +
+ +
+ + +
From 6e880cfd4954c4a044358a823fac4dc9d5467a6b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 7 Jul 2013 17:22:40 -0700 Subject: [PATCH 10/15] use current channel photo for favicon where applicable - might be browser dependent but seems to work on FF --- boot.php | 31 + doc/html/boot_8php.html | 52 +- doc/html/boot_8php.js | 2 +- doc/html/contact__selectors_8php.html | 20 +- doc/html/contact__selectors_8php.js | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/docblox__errorchecker_8php.html | 2 +- doc/html/extract_8php.html | 2 +- doc/html/features_8php.html | 2 +- doc/html/globals_0x63.html | 2 +- doc/html/globals_0x6f.html | 6 + doc/html/globals_0x70.html | 2 +- doc/html/globals_0x72.html | 3 + doc/html/globals_0x74.html | 4 +- doc/html/globals_func_0x63.html | 2 +- doc/html/globals_func_0x6f.html | 6 + doc/html/globals_func_0x70.html | 2 +- doc/html/globals_func_0x72.html | 3 + doc/html/globals_func_0x74.html | 4 +- doc/html/include_2config_8php.html | 2 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/mod_2photos_8php.html | 2 + doc/html/navtree.js | 2 +- doc/html/navtreeindex0.js | 4 +- doc/html/navtreeindex1.js | 2 +- doc/html/navtreeindex2.js | 2 +- doc/html/navtreeindex3.js | 4 +- doc/html/navtreeindex5.js | 2 +- doc/html/navtreeindex6.js | 39 +- doc/html/permissions_8php.html | 2 +- doc/html/php2po_8php.html | 2 +- doc/html/plugin_8php.html | 4 +- doc/html/search/all_63.js | 2 +- doc/html/search/all_6f.js | 2 + doc/html/search/all_70.js | 2 +- doc/html/search/all_72.js | 1 + doc/html/search/all_74.js | 4 +- doc/html/search/functions_63.js | 2 +- doc/html/search/functions_6f.js | 2 + doc/html/search/functions_70.js | 2 +- doc/html/search/functions_72.js | 1 + doc/html/search/functions_74.js | 4 +- doc/html/taxonomy_8php.html | 81 ++- doc/html/taxonomy_8php.js | 6 +- doc/html/text_8php.html | 10 +- doc/html/thing_8php.html | 4 + doc/html/typo_8php.html | 2 +- doc/html/typohelper_8php.html | 2 +- doc/html/zot_8php.html | 36 ++ doc/html/zot_8php.js | 1 + mod/connections.php | 5 + mod/message.php | 1 + mod/network.php | 3 + mod/settings.php | 5 + util/messages.po | 690 +++++++++++++---------- version.inc | 2 +- view/tpl/head.tpl | 2 +- 59 files changed, 672 insertions(+), 424 deletions(-) diff --git a/boot.php b/boot.php index bf99c142e..590410bae 100755 --- a/boot.php +++ b/boot.php @@ -699,6 +699,8 @@ class App { $this->is_mobile = $mobile_detect->isMobile(); $this->is_tablet = $mobile_detect->isTablet(); + $this->head_set_icon('/images/rhash-32.png'); + BaseObject::set_app($this); /** @@ -899,6 +901,7 @@ class App { '$local_user' => local_user(), '$generator' => RED_PLATFORM . ' ' . RED_VERSION, '$update_interval' => $interval, + '$icon' => head_get_icon(), '$head_css' => head_get_css(), '$head_js' => head_get_js(), '$js_strings' => js_strings() @@ -997,6 +1000,17 @@ class App { return $this->rdelim[$engine]; } + function head_set_icon($icon) { + $this->data['pageicon'] = $icon; + + } + + function head_get_icon() { + $icon = $this->data['pageicon']; + if(! strpos($icon,'://')) + $icon = z_root() . $icon; + return $icon; + } } @@ -1569,6 +1583,8 @@ function profile_sidebar($profile, $block = 0) { return $o; + head_set_icon($profile['thumb']); + $is_owner = (($profile['uid'] == local_user()) ? true : false); $profile['picdate'] = urlencode($profile['picdate']); @@ -2288,3 +2304,18 @@ function construct_page(&$a) { function appdirpath() { return dirname(__FILE__); } + + +function head_set_icon($icon) { + global $a; + $a->data['pageicon'] = $icon; + logger('head_set_icon: ' . $icon); +} + +function head_get_icon() { + global $a; + $icon = $a->data['pageicon']; + if(! strpos($icon,'://')) + $icon = z_root() . $icon; + return $icon; +} diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index d2f8d73f8..2d6242436 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -159,8 +159,8 @@ Functions    get_max_import_size ()   - profile_load (&$a, $nickname, $profile=0) -  + profile_load (&$a, $nickname, $profile= '') +   profile_create_sidebar (&$a)    profile_sidebar ($profile, $block=0) @@ -216,7 +216,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1047 +const DB_UPDATE_VERSION 1049   const EOL '<br />' . "\r\n"   @@ -642,7 +642,7 @@ Variables
-

Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), attach_init(), channel_content(), channel_init(), common_init(), connections_content(), connections_init(), contactgroup_content(), display_content(), editpost_content(), events_content(), feed_init(), group_content(), group_post(), like_content(), lockview_content(), manage_content(), message_content(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), profile_init(), profile_photo_post(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), settings_aside(), settings_post(), setup_init(), share_init(), starred_init(), subthread_content(), tagger_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and zotfeed_init().

+

Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), attach_init(), channel_content(), channel_init(), common_init(), connections_content(), connections_init(), contactgroup_content(), display_content(), editpost_content(), events_content(), feed_init(), group_content(), group_post(), like_content(), lockview_content(), manage_content(), message_content(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poller_run(), post_init(), profile_init(), profile_photo_post(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), settings_aside(), settings_post(), setup_init(), share_init(), starred_init(), subthread_content(), tagger_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and zotfeed_init().

@@ -980,7 +980,7 @@ Variables
-

Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_store(), common_content(), common_friends_visitor_widget(), display_content(), editpost_content(), get_public_feed(), new_contact(), photo_init(), photos_post(), prepare_body(), suggest_content(), viewconnections_content(), wall_attach_post(), and z_readdir().

+

Referenced by attach_by_hash(), attach_by_hash_nodata(), attach_store(), common_content(), common_friends_visitor_widget(), display_content(), editpost_content(), get_public_feed(), new_contact(), photo_init(), photos_post(), prepare_body(), suggest_content(), tagger_content(), thing_init(), viewconnections_content(), wall_attach_post(), and z_readdir().

@@ -1016,7 +1016,7 @@ Variables
-

Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_post(), authenticate_success(), community_content(), connections_content(), connections_post(), crepair_post(), directory_content(), dirfind_content(), follow_init(), fsuggest_post(), group_content(), group_post(), intro_post(), item_post(), lostpass_content(), lostpass_post(), match_content(), message_content(), network_content(), notifications_content(), oexchange_content(), post_init(), profile_photo_post(), profiles_init(), profiles_post(), register_post(), regmod_content(), settings_post(), suggest_content(), tagrm_post(), user_allow(), and viewconnections_content().

+

Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_post(), authenticate_success(), community_content(), connections_content(), connections_post(), crepair_post(), directory_content(), dirfind_content(), follow_init(), fsuggest_post(), group_content(), group_post(), intro_post(), item_post(), lostpass_content(), lostpass_post(), match_content(), message_content(), network_content(), notifications_content(), oexchange_content(), post_init(), profile_photo_post(), profiles_init(), profiles_post(), register_post(), regmod_content(), settings_post(), suggest_content(), tagrm_post(), thing_init(), user_allow(), and viewconnections_content().

@@ -1050,7 +1050,7 @@ Variables
-

Referenced by admin_content(), admin_post(), check_account_admin(), findpeople_widget(), invite_content(), invite_post(), nav(), ping_init(), register_post(), and regmod_content().

+

Referenced by admin_content(), admin_post(), check_account_admin(), findpeople_widget(), invite_content(), invite_post(), nav(), ping_init(), register_post(), regmod_content(), and thing_init().

@@ -1102,7 +1102,7 @@ Variables
-

Referenced by Item\__construct(), acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), best_link_url(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), crepair_content(), crepair_init(), crepair_post(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editpost_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_post(), share_init(), smilies(), starred_init(), stream_perms_api_uids(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), and zid_init().

+

Referenced by Item\__construct(), acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), best_link_url(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), crepair_content(), crepair_init(), crepair_post(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editpost_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_post(), share_init(), smilies(), starred_init(), stream_perms_api_uids(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), and zid_init().

@@ -1154,7 +1154,7 @@ Variables
-

Referenced by admin_content(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), channel_content(), channel_init(), chanview_content(), check_form_security_token_redirectOnErr(), common_content(), common_init(), community_content(), connections_content(), connections_post(), crepair_content(), crepair_post(), delegate_content(), directory_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_content(), import_post(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), like_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), nogroup_content(), notifications_content(), notifications_post(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), rmagic_post(), search_content(), settings_post(), suggest_content(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and xchan_content().

+

Referenced by admin_content(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), channel_content(), channel_init(), chanview_content(), check_form_security_token_redirectOnErr(), common_content(), common_init(), community_content(), connections_content(), connections_post(), crepair_content(), crepair_post(), delegate_content(), directory_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_content(), import_post(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), like_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), nogroup_content(), notifications_content(), notifications_post(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), rmagic_post(), search_content(), settings_post(), suggest_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and xchan_content().

@@ -1176,7 +1176,7 @@ Variables

e.g.: proc_run("ls","-la","/tmp");

$cmd and string args are surrounded with ""

-

Referenced by build_sync_packet(), connections_content(), connections_post(), create_identity(), directory_run(), drop_item(), drop_items(), events_post(), fsuggest_post(), item_expire(), item_post(), like_content(), local_delivery(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

+

Referenced by build_sync_packet(), connections_content(), connections_post(), create_identity(), directory_run(), drop_item(), drop_items(), events_post(), fsuggest_post(), item_expire(), item_post(), like_content(), local_delivery(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), tag_deliver(), tagger_content(), thing_init(), zid_init(), and zot_refresh().

@@ -1198,7 +1198,7 @@ Variables - +
@@ -1218,7 +1218,7 @@ Variables - + @@ -1227,7 +1227,7 @@ Variables
 $profile = 0 $profile = '' 
-

Function : profile_load App $a string $nickname int $profile

+

Function : profile_load App $a string $nickname string $profile

Summary: Loads a profile into the page sidebar. The function requires a writeable copy of the main App structure, and the nickname of a registered local account.

If the viewer is an authenticated remote viewer, the profile displayed is the one that has been configured for his/her viewing in the Contact manager. Passing a non-zero profile ID can also allow a preview of a selected profile by the owner.

Profile information is placed in the App structure for later retrieval. Honours the owner's chosen theme for display.

@@ -1923,7 +1923,7 @@ Variables
-

Referenced by consume_feed(), local_delivery(), tag_deliver(), and tagger_content().

+

Referenced by consume_feed(), local_delivery(), remove_community_tag(), tag_deliver(), and tagger_content().

@@ -1937,7 +1937,7 @@ Variables
-

Referenced by localize_item().

+

Referenced by localize_item(), and thing_init().

@@ -1993,7 +1993,7 @@ Variables
-

Referenced by consume_feed(), local_delivery(), photos_post(), tag_deliver(), and tagger_content().

+

Referenced by consume_feed(), local_delivery(), photos_post(), remove_community_tag(), tag_deliver(), and tagger_content().

@@ -2171,7 +2171,7 @@ Variables
- +
const DB_UPDATE_VERSION 1047const DB_UPDATE_VERSION 1049
@@ -2285,7 +2285,7 @@ Variables
-

Referenced by admin_page_dbsync(), admin_page_site_post(), admin_page_users(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), authenticate_success(), channel_content(), channel_init(), chanview_content(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_keys(), check_php(), common_content(), common_init(), community_content(), connections_content(), connections_post(), crepair_content(), crepair_post(), delegate_content(), directory_content(), dirfind_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_post(), import_xchan(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), nogroup_content(), notifications_content(), notifications_post(), oexchange_content(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), search_content(), settings_post(), setup_content(), suggest_content(), tagrm_post(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and xchan_content().

+

Referenced by admin_page_dbsync(), admin_page_site_post(), admin_page_users(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), authenticate_success(), channel_content(), channel_init(), chanview_content(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_keys(), check_php(), common_content(), common_init(), community_content(), connections_content(), connections_post(), crepair_content(), crepair_post(), delegate_content(), directory_content(), dirfind_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), import_post(), import_xchan(), intro_content(), intro_post(), invite_content(), invite_post(), item_post(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), nogroup_content(), notifications_content(), notifications_post(), oexchange_content(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), search_content(), settings_post(), setup_content(), suggest_content(), tagrm_post(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), and xchan_content().

@@ -2491,7 +2491,7 @@ Variables

Item Flags

-

Referenced by event_store(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), and tagger_content().

+

Referenced by event_store(), item_post(), like_content(), mood_init(), notifier_run(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), tagger_content(), and thing_init().

@@ -2543,7 +2543,7 @@ Variables
-

Referenced by channel_content(), encode_item_flags(), event_store(), format_notification(), item_post(), item_store(), items_fetch(), like_content(), mood_init(), network_content(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), and tag_deliver().

+

Referenced by channel_content(), encode_item_flags(), event_store(), format_notification(), item_post(), item_store(), items_fetch(), like_content(), mood_init(), network_content(), photo_upload(), photos_create_item(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), and thing_init().

@@ -2624,7 +2624,7 @@ Variables
-

Referenced by api_get_user(), channel_content(), drop_item(), event_store(), events_content(), first_post_date(), item_post(), item_store(), items_fetch(), like_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), tagger_content(), and zot_feed().

+

Referenced by api_get_user(), channel_aside(), channel_content(), drop_item(), event_store(), events_content(), first_post_date(), item_post(), item_store(), items_fetch(), like_content(), mood_init(), notification(), notifier_run(), photo_upload(), photos_create_item(), ping_init(), poke_init(), post_activity_item(), profile_activity(), tag_deliver(), tagger_content(), thing_init(), and zot_feed().

@@ -2710,7 +2710,7 @@ Variables
-

Referenced by admin_page_logs(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_post(), item_store(), item_store_update(), lrdd(), mail_store(), message_content(), message_post(), mini_group_select(), new_contact(), notifier_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), tag_deliver(), tgroup_check(), webfinger_dfrn(), xml2array(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

+

Referenced by admin_page_logs(), advanced_profile(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_post(), item_store(), item_store_update(), lrdd(), mail_store(), message_content(), message_post(), mini_group_select(), new_contact(), notifier_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), tag_deliver(), tgroup_check(), webfinger_dfrn(), xml2array(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

@@ -2724,7 +2724,7 @@ Variables
-

Referenced by Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), delete_imported_item(), deliver_run(), dfrn_deliver(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), local_delivery(), FKOAuth1\loginUser(), lrdd(), mail_store(), mood_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), redir_init(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), and zot_register_hub().

+

Referenced by Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), delete_imported_item(), deliver_run(), dfrn_deliver(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), local_delivery(), FKOAuth1\loginUser(), lrdd(), mail_store(), mood_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), redir_init(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), and zot_register_hub().

@@ -3933,7 +3933,7 @@ Variables
-

Referenced by conversation(), decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), item_post(), items_fetch(), network_content(), search_ac_init(), search_content(), and tag_deliver().

+

Referenced by conversation(), decode_tags(), encode_item_terms(), format_term_for_display(), get_atom_elements(), handle_tag(), item_getfeedtags(), item_post(), items_fetch(), network_content(), remove_community_tag(), search_ac_init(), search_content(), tag_deliver(), and tagger_content().

@@ -3997,7 +3997,7 @@ Variables
-

Referenced by delete_item_lowlevel(), fetch_post_tags(), filer_content(), get_atom_elements(), item_post(), item_store(), item_store_update(), search_content(), tag_deliver(), and tagadelic().

+

Referenced by delete_item_lowlevel(), fetch_post_tags(), filer_content(), get_atom_elements(), item_post(), item_store(), item_store_update(), remove_community_tag(), search_content(), tag_deliver(), tagadelic(), and tagger_content().

@@ -4023,7 +4023,7 @@ Variables
-

Referenced by thing_init().

+

Referenced by advanced_profile(), and thing_init().

diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 317d8be2f..190a767cc 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -33,7 +33,7 @@ var boot_8php = [ "notice", "boot_8php.html#a9255af5ae9c887520091ea04763c1a88", null ], [ "proc_run", "boot_8php.html#ab346a2ece14993861f3e4206befa94f0", null ], [ "profile_create_sidebar", "boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67", null ], - [ "profile_load", "boot_8php.html#aebc5ed38c73ade57f360471da712ded2", null ], + [ "profile_load", "boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ], [ "profile_sidebar", "boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b", null ], [ "profile_tabs", "boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273", null ], [ "remote_user", "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209", null ], diff --git a/doc/html/contact__selectors_8php.html b/doc/html/contact__selectors_8php.html index 3a1169d9a..04f992db5 100644 --- a/doc/html/contact__selectors_8php.html +++ b/doc/html/contact__selectors_8php.html @@ -112,8 +112,8 @@ $(document).ready(function(){initNavTree('contact__selectors_8php.html','');}); - - + + @@ -150,7 +150,7 @@ Functions - +

Functions

 contact_profile_assign ($current, $foreign_net)
 
 contact_profile_assign ($current)
 
 contact_reputation ($current)
 
 contact_poll_interval ($current, $disabled=false)
@@ -158,22 +158,14 @@ Functions - - - - + - - - - - - -
contact_profile_assign (  $current,
$current)  $foreign_net 
)
+

Referenced by connections_content(), and thing_content().

+
diff --git a/doc/html/contact__selectors_8php.js b/doc/html/contact__selectors_8php.js index b03d1934d..dcf8466e2 100644 --- a/doc/html/contact__selectors_8php.js +++ b/doc/html/contact__selectors_8php.js @@ -1,7 +1,7 @@ var contact__selectors_8php = [ [ "contact_poll_interval", "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f", null ], - [ "contact_profile_assign", "contact__selectors_8php.html#aba7a4db18efa41d78bed1076b2d59886", null ], + [ "contact_profile_assign", "contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75", null ], [ "contact_reputation", "contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53", null ], [ "network_to_name", "contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be", null ] ]; \ No newline at end of file diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 4a085458a..6eabd6ace 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -170,7 +170,7 @@ Functions
-

Referenced by advanced_profile(), directory_content(), and profiles_content().

+

Referenced by advanced_profile(), directory_content(), profiles_content(), syncdirs(), and zfinger_init().

diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 01d9b8275..0b710400f 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
-

Referenced by account_verify_password(), acl_init(), add_fcontact(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), build_sync_packet(), call_hooks(), change_channel(), channel_content(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_webbie(), Cache\clear(), common_friends(), connections_content(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editpost_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_pconfig(), load_plugin(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_queue_item(), rmagic_init(), rmagic_post(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), photo_driver\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), thing_init(), uninstall_plugin(), unregister_hook(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

+

Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), build_sync_packet(), call_hooks(), change_channel(), channel_content(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_webbie(), Cache\clear(), common_friends(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editpost_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_pconfig(), load_plugin(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), photo_driver\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), thing_init(), uninstall_plugin(), unregister_hook(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

@@ -320,7 +320,7 @@ Functions

This will happen occasionally trying to store the session data after abnormal program termination

-

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_summary(), admin_page_users(), admin_page_users_post(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_webbie(), Cache\clear(), collect_recipients(), common_friends(), common_friends_zcid(), common_init(), community_content(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), directory_run(), dirsearch_content(), display_content(), drop_item(), editpost_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), install_plugin(), intro_content(), intro_post(), invite_post(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lose_follower(), lose_sharer(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), message_content(), mini_group_select(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_queue_item(), rmagic_init(), rmagic_post(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

+

Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_total(), account_verify_password(), acl_init(), add_fcontact(), admin_content(), admin_page_dbsync(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allfriends_content(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_status_show(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_user_timeline(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_webbie(), Cache\clear(), collect_recipients(), common_friends(), common_friends_zcid(), common_init(), community_content(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), contacts_not_grouped(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), crepair_content(), crepair_init(), crepair_post(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dfrn_deliver(), directory_run(), dirsearch_content(), display_content(), drop_item(), editpost_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), first_post_date(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), identity_basic_export(), identity_check_service_class(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), install_plugin(), intro_content(), intro_post(), invite_post(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lose_follower(), lose_sharer(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), message_content(), mini_group_select(), mood_init(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_delivery(), process_mail_delivery(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), qsearch_init(), queue_run(), random_profile(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

diff --git a/doc/html/docblox__errorchecker_8php.html b/doc/html/docblox__errorchecker_8php.html index ea69f6350..b625dc857 100644 --- a/doc/html/docblox__errorchecker_8php.html +++ b/doc/html/docblox__errorchecker_8php.html @@ -253,7 +253,7 @@ Variables
-

Referenced by aes_encapsulate(), aes_unencapsulate(), alt_pager(), check_config(), consume_feed(), drop_item(), fix_private_photos(), get_bb_tag_pos(), is_a_date_arg(), item_post(), item_redir_and_replace_images(), jindent(), load_database_rem(), local_delivery(), node2bbcodesub(), paginate(), photos_post(), profile_activity(), reload_plugins(), scale_external_images(), tag_deliver(), and zot_import().

+

Referenced by aes_encapsulate(), aes_unencapsulate(), alt_pager(), check_config(), consume_feed(), drop_item(), fix_private_photos(), get_bb_tag_pos(), is_a_date_arg(), item_post(), item_redir_and_replace_images(), jindent(), load_database_rem(), local_delivery(), node2bbcodesub(), paginate(), photos_post(), profile_activity(), reload_plugins(), remove_community_tag(), scale_external_images(), tag_deliver(), and zot_import().

diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 0e6c790c5..57eaf2116 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
-

Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), mood_init(), network_content(), new_channel_post(), new_contact(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), photos_post(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), prepare_body(), proc_run(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), validate_channelname(), wfinger_init(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

+

Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), photos_post(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), prepare_body(), proc_run(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), validate_channelname(), wfinger_init(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 54fcf31ab..e89400736 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions
-

Referenced by categories_widget(), connections_content(), conversation(), editpost_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), message_content(), message_post(), nav(), network_content(), photos_content(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), saved_searches(), search_saved_searches(), and theme_content().

+

Referenced by categories_widget(), channel_aside(), connections_content(), conversation(), editpost_content(), Item\get_comment_box(), Item\get_template_data(), item_post(), message_content(), message_post(), nav(), network_content(), photos_content(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), saved_searches(), search_saved_searches(), theme_content(), and thing_content().

diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 7c2aa6af0..f4a5a2556 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -346,7 +346,7 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');}); : contact_selectors.php
  • contact_profile_assign() -: contact_selectors.php +: contact_selectors.php
  • contact_remove() : Contact.php diff --git a/doc/html/globals_0x6f.html b/doc/html/globals_0x6f.html index 87062c8dc..8e17bfdd7 100644 --- a/doc/html/globals_0x6f.html +++ b/doc/html/globals_0x6f.html @@ -147,6 +147,12 @@ $(document).ready(function(){initNavTree('globals_0x6f.html','');});
  • oauth_get_client() : api.php
    • +
  • obj_verb_selector() +: taxonomy.php +
    • +
  • obj_verbs() +: taxonomy.php +
  • oe_build_xpath() : oembed.php
    • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 8de09200d..00ddc3850 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -429,7 +429,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : profile.php
  • profile_load() -: boot.php +: boot.php
  • profile_photo_aside() : profile_photo.php diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 952740da5..4b00bcd2d 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -243,6 +243,9 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
  • remove_all_xchan_resources() : Contact.php
    • +
  • remove_community_tag() +: zot.php +
  • remove_queue_item() : queue_fn.php
    • diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html index 54095872c..088aeedb9 100644 --- a/doc/html/globals_0x74.html +++ b/doc/html/globals_0x74.html @@ -151,10 +151,10 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');}); : items.php
  • tagadelic() -: taxonomy.php +: taxonomy.php
  • tagblock() -: taxonomy.php +: taxonomy.php
  • tagger_content() : tagger.php diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index d56caaa8b..f8638a4d4 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -327,7 +327,7 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');}); : contact_selectors.php
  • contact_profile_assign() -: contact_selectors.php +: contact_selectors.php
  • contact_remove() : Contact.php diff --git a/doc/html/globals_func_0x6f.html b/doc/html/globals_func_0x6f.html index 5ba02cc9c..3bf397f45 100644 --- a/doc/html/globals_func_0x6f.html +++ b/doc/html/globals_func_0x6f.html @@ -146,6 +146,12 @@ $(document).ready(function(){initNavTree('globals_func_0x6f.html','');});
  • oauth_get_client() : api.php
    • +
  • obj_verb_selector() +: taxonomy.php +
    • +
  • obj_verbs() +: taxonomy.php +
  • oe_build_xpath() : oembed.php
    • diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 15c8453d2..b96c26c94 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -339,7 +339,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : profile.php
  • profile_load() -: boot.php +: boot.php
  • profile_photo_aside() : profile_photo.php diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index 41003bdac..37d08a6de 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -221,6 +221,9 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
  • remove_all_xchan_resources() : Contact.php
    • +
  • remove_community_tag() +: zot.php +
  • remove_queue_item() : queue_fn.php
    • diff --git a/doc/html/globals_func_0x74.html b/doc/html/globals_func_0x74.html index 464211b31..163dba938 100644 --- a/doc/html/globals_func_0x74.html +++ b/doc/html/globals_func_0x74.html @@ -150,10 +150,10 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');}); : items.php
  • tagadelic() -: taxonomy.php +: taxonomy.php
  • tagblock() -: taxonomy.php +: taxonomy.php
  • tagger_content() : tagger.php diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 7b633ec4c..23d42703f 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -324,7 +324,7 @@ Functions
    -

    Referenced by App\build_pagehead(), channel_aside(), channel_content(), community_content(), contact_block(), contact_remove(), conversation(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), group_content(), intro_content(), invite_content(), invite_post(), item_expire(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), message_content(), network_content(), network_init(), notifications_content(), profile_activity(), profperm_content(), set_pconfig(), smilies(), tag_deliver(), and theme_content().

    +

    Referenced by App\build_pagehead(), channel_aside(), channel_content(), community_content(), contact_block(), contact_remove(), conversation(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), group_content(), intro_content(), invite_content(), invite_post(), item_expire(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), message_content(), network_content(), network_init(), notifications_content(), profile_activity(), profperm_content(), remove_community_tag(), set_pconfig(), smilies(), tag_deliver(), and theme_content().

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 9ddcc712c..d38fc39e5 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -1512,7 +1512,7 @@ Functions
    Returns
    array 'success' => true or false 'activity' => the resulting activity if successful
    -

    Referenced by api_channel_stream(), poke_init(), and tagger_content().

    +

    Referenced by api_channel_stream(), poke_init(), tagger_content(), and thing_init().

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 09e59b85d..774112673 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
    -

    Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), allfriends_content(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), apps_content(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_store(), authenticate_success(), bb_ShareAttributes(), bbcode(), categories_widget(), channel_content(), channel_init(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_content(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_poll_interval(), contact_reputation(), conversation(), create_account(), create_identity(), crepair_content(), crepair_post(), datesel_format(), day_translate(), delegate_content(), directory_content(), dirfind_content(), dirsearch_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), follow_widget(), format_event_diaspora(), format_event_html(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), intro_content(), intro_post(), invite_content(), invite_post(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), message_aside(), message_content(), message_post(), mini_group_select(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), new_follower(), nogroup_content(), notification(), notifications_content(), notifications_post(), notify_content(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), populate_acl(), post_activity_item(), post_init(), posted_date_widget(), prepare_body(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), saved_searches(), scale_external_images(), search(), search_content(), search_saved_searches(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), timezone_cmp(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_deny(), validate_channelname(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_upload_post(), what_next(), xchan_content(), z_readdir(), and zfinger_init().

    +

    Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), allfriends_content(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), apps_content(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_store(), authenticate_success(), bb_ShareAttributes(), bbcode(), categories_widget(), channel_content(), channel_init(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_content(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_poll_interval(), contact_reputation(), conversation(), create_account(), create_identity(), crepair_content(), crepair_post(), datesel_format(), day_translate(), delegate_content(), directory_content(), dirfind_content(), dirsearch_content(), display_content(), drop_item(), editpost_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), follow_widget(), format_event_diaspora(), format_event_html(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), intro_content(), intro_post(), invite_content(), invite_post(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), message_aside(), message_content(), message_post(), mini_group_select(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), new_follower(), nogroup_content(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), populate_acl(), post_activity_item(), post_init(), posted_date_widget(), prepare_body(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), saved_searches(), scale_external_images(), search(), search_content(), search_saved_searches(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), thing_content(), thing_init(), timezone_cmp(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_deny(), validate_channelname(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_upload_post(), what_next(), xchan_content(), z_readdir(), and zfinger_init().

    diff --git a/doc/html/mod_2photos_8php.html b/doc/html/mod_2photos_8php.html index c430b2688..597449f36 100644 --- a/doc/html/mod_2photos_8php.html +++ b/doc/html/mod_2photos_8php.html @@ -133,6 +133,8 @@ Functions
    +

    Display upload form

    +

    Display one photo

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index bcfb2a5e0..1520e8931 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,7 +36,7 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393", +"boot_8php.html#ab346a2ece14993861f3e4206befa94f0", "classItem.html#acc32426c0f465391be8a99ad810c7b8e", "dirfind_8php.html", "include_2api_8php.html#ad2b0192f3006918bea895de8074bf8d2", diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 374429175..bb8873776 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -153,6 +153,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,145], "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,70], "boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,228], +"boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,4,33], "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,19], "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,157], "boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,102], @@ -248,6 +249,5 @@ var NAVTREEINDEX0 = "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,65], "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,168], "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,107], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,189], -"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,31] +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,189] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index e88c79af5..6151c2b20 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,5 +1,6 @@ var NAVTREEINDEX1 = { +"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,31], "boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,161], "boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,193], "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,106], @@ -50,7 +51,6 @@ var NAVTREEINDEX1 = "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,166], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,26], "boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,226], -"boot_8php.html#aebc5ed38c73ade57f360471da712ded2":[5,0,4,33], "boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,197], "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,98], "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,153], diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 4c3697a9c..95c69678a 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -141,8 +141,8 @@ var NAVTREEINDEX2 = "connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,11,2], "connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,11,0], "contact__selectors_8php.html":[5,0,0,15], +"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,15,1], "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,15,0], -"contact__selectors_8php.html#aba7a4db18efa41d78bed1076b2d59886":[5,0,0,15,1], "contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,15,3], "contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,15,2], "contact__widgets_8php.html":[5,0,0,16], diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index c9e3d662a..0db750be2 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -101,8 +101,8 @@ var NAVTREEINDEX3 = "functions_0x76.html":[4,3,0,18], "functions_func.html":[4,3,1], "functions_vars.html":[4,3,2], -"globals.html":[5,1,0,0], "globals.html":[5,1,0], +"globals.html":[5,1,0,0], "globals_0x5f.html":[5,1,0,1], "globals_0x61.html":[5,1,0,2], "globals_0x62.html":[5,1,0,3], @@ -129,8 +129,8 @@ var NAVTREEINDEX3 = "globals_0x77.html":[5,1,0,24], "globals_0x78.html":[5,1,0,25], "globals_0x7a.html":[5,1,0,26], -"globals_func.html":[5,1,1,0], "globals_func.html":[5,1,1], +"globals_func.html":[5,1,1,0], "globals_func_0x61.html":[5,1,1,1], "globals_func_0x62.html":[5,1,1,2], "globals_func_0x63.html":[5,1,1,3], diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index e297764bd..ca70b8768 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -25,8 +25,8 @@ var NAVTREEINDEX5 = "namespaces.html":[3,0], "namespaceupdatetpl.html":[4,0,3], "namespaceupdatetpl.html":[3,0,3], -"namespaceutil.html":[3,0,4], "namespaceutil.html":[4,0,4], +"namespaceutil.html":[3,0,4], "nav_8php.html":[5,0,0,41], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,41,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,41,1], diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 2509fd8ca..c5665a1dd 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -52,16 +52,18 @@ var NAVTREEINDEX6 = "tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,88,1], "tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,88,0], "taxonomy_8php.html":[5,0,0,62], +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,62,6], +"taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,62,8], "taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,62,0], "taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,62,4], "taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,62,2], "taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,62,1], -"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,62,5], -"taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6":[5,0,0,62,7], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,62,9], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,62,8], +"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,62,7], +"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,62,11], +"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,62,10], +"taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f":[5,0,0,62,9], +"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,62,5], "taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,62,3], -"taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d":[5,0,0,62,6], "template__processor_8php.html":[5,0,0,63], "template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,63,3], "template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,63,1], @@ -217,26 +219,27 @@ var NAVTREEINDEX6 = "zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,106,0], "zot_8php.html":[5,0,0,65], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,65,8], -"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,65,16], -"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,65,9], +"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,65,17], +"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,65,10], "zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,65,5], -"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,65,11], +"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,65,12], "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,65,2], "zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32":[5,0,0,65,3], -"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,65,15], -"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,65,20], -"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,65,12], -"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,65,10], +"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,65,16], +"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,65,21], +"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,65,13], +"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,65,11], "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,65,0], -"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,65,13], -"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,65,19], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,65,18], +"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,65,14], +"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,65,20], +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,65,19], "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,65,7], "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,65,6], +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,65,9], "zot_8php.html#ab0227978011d8601494a7651fa26acf0":[5,0,0,65,4], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,65,17], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,65,21], -"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,65,14], +"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,65,18], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,65,22], +"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,65,15], "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,65,1], "zotfeed_8php.html":[5,0,1,107], "zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,107,0] diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index a847fde8b..9386dcc7b 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -246,7 +246,7 @@ Functions
    -

    Referenced by api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), get_feed_for(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_load(), profile_sidebar(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), z_readdir(), and zot_feed().

    +

    Referenced by api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), get_feed_for(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_load(), profile_sidebar(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), z_readdir(), and zot_feed().

    diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index 79bf9779d..63218ed68 100644 --- a/doc/html/php2po_8php.html +++ b/doc/html/php2po_8php.html @@ -168,7 +168,7 @@ Variables
    -

    Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), aes_encapsulate(), aes_unencapsulate(), build_sync_packet(), connections_content(), connections_post(), contact_poll_interval(), contact_reputation(), get_plugin_info(), get_theme_info(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), message_post(), mood_content(), network_init(), new_contact(), FKOAuthDataStore\new_request_token(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), requestdata(), App\set_widget(), settings_post(), startup(), syncdirs(), tt(), x(), zfinger_init(), and zot_refresh().

    +

    Referenced by App\__construct(), Template\_get_var(), Template\_replcb_for(), activity_sanitise(), advanced_profile(), aes_encapsulate(), aes_unencapsulate(), build_sync_packet(), connections_content(), connections_post(), contact_poll_interval(), contact_reputation(), get_plugin_info(), get_theme_info(), guess_image_type(), import_directory_profile(), item_photo_menu(), item_store_update(), load_config(), load_pconfig(), load_xconfig(), message_post(), mood_content(), network_init(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), requestdata(), App\set_widget(), settings_post(), startup(), syncdirs(), tt(), x(), zfinger_init(), and zot_refresh().

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 3f164552e..918b7e995 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -190,7 +190,7 @@ Functions
    -

    Referenced by api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), check_account_email(), check_account_invite(), check_account_password(), connections_content(), connections_post(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), editpost_content(), event_store(), feature_enabled(), gender_selector(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), Item\get_template_data(), App\get_widgets(), group_select(), html2bbcode(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), login(), FKOAuth1\loginUser(), magic_init(), mail_store(), marital_selector(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), post_activity_item(), post_init(), prepare_body(), proc_run(), profile_content(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_post(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

    +

    Referenced by api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), check_account_email(), check_account_invite(), check_account_password(), connections_content(), connections_post(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), editpost_content(), event_store(), feature_enabled(), gender_selector(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), Item\get_template_data(), App\get_widgets(), group_select(), html2bbcode(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), login(), FKOAuth1\loginUser(), magic_init(), mail_store(), marital_selector(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), obj_verbs(), oembed_fetch_url(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), post_activity_item(), post_init(), prepare_body(), proc_run(), profile_content(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_post(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

    @@ -282,7 +282,7 @@ Functions
    -

    Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), directory_content(), dirfind_content(), display_content(), editpost_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), login(), lostpass_content(), manage_content(), match_content(), message_aside(), message_content(), micropro(), mini_group_select(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), suggest_content(), vcard_from_xchan(), viewconnections_content(), and xrd_init().

    +

    Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), directory_content(), dirfind_content(), display_content(), editpost_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), login(), lostpass_content(), manage_content(), match_content(), message_aside(), message_content(), micropro(), mini_group_select(), mood_content(), nav(), network_content(), new_channel_content(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), settings_aside(), setup_content(), siteinfo_content(), suggest_content(), thing_content(), vcard_from_xchan(), viewconnections_content(), and xrd_init().

    diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 8809b5b7d..086b4367e 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -87,7 +87,7 @@ var searchData= ['contact_5fis_5ffriend',['CONTACT_IS_FRIEND',['../boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f',1,'boot.php']]], ['contact_5fis_5fsharing',['CONTACT_IS_SHARING',['../boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9',1,'boot.php']]], ['contact_5fpoll_5finterval',['contact_poll_interval',['../contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f',1,'contact_selectors.php']]], - ['contact_5fprofile_5fassign',['contact_profile_assign',['../contact__selectors_8php.html#aba7a4db18efa41d78bed1076b2d59886',1,'contact_selectors.php']]], + ['contact_5fprofile_5fassign',['contact_profile_assign',['../contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75',1,'contact_selectors.php']]], ['contact_5fremove',['contact_remove',['../Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6',1,'Contact.php']]], ['contact_5freputation',['contact_reputation',['../contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53',1,'contact_selectors.php']]], ['contact_5fselect',['contact_select',['../acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91',1,'acl_selectors.php']]], diff --git a/doc/html/search/all_6f.js b/doc/html/search/all_6f.js index 4fb5975d5..095330fe4 100644 --- a/doc/html/search/all_6f.js +++ b/doc/html/search/all_6f.js @@ -2,6 +2,8 @@ var searchData= [ ['oauth_2ephp',['oauth.php',['../oauth_8php.html',1,'']]], ['oauth_5fget_5fclient',['oauth_get_client',['../mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117',1,'api.php']]], + ['obj_5fverb_5fselector',['obj_verb_selector',['../taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2',1,'taxonomy.php']]], + ['obj_5fverbs',['obj_verbs',['../taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce',1,'taxonomy.php']]], ['oe_5fbuild_5fxpath',['oe_build_xpath',['../include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319',1,'oembed.php']]], ['oe_5fget_5finner_5fhtml',['oe_get_inner_html',['../include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487',1,'oembed.php']]], ['oembed_2ephp',['oembed.php',['../include_2oembed_8php.html',1,'']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 2d5ae73fa..e21a995ac 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -122,7 +122,7 @@ var searchData= ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]], ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67',1,'boot.php']]], ['profile_5finit',['profile_init',['../profile_8php.html#ab5d0246be0552e2182a585c1206d22a5',1,'profile.php']]], - ['profile_5fload',['profile_load',['../boot_8php.html#aebc5ed38c73ade57f360471da712ded2',1,'boot.php']]], + ['profile_5fload',['profile_load',['../boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'boot.php']]], ['profile_5fphoto_2ephp',['profile_photo.php',['../profile__photo_8php.html',1,'']]], ['profile_5fphoto_5faside',['profile_photo_aside',['../profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3',1,'profile_photo.php']]], ['profile_5fphoto_5finit',['profile_photo_init',['../profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02',1,'profile_photo.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 0d63bc678..6b22324f7 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -42,6 +42,7 @@ var searchData= ['remote_5fuser',['remote_user',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]], ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]], ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]], + ['remove_5fcommunity_5ftag',['remove_community_tag',['../zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10',1,'zot.php']]], ['remove_5fparent',['remove_parent',['../classItem.html#aa452b5bcd8dea12119b09212c615cb41',1,'Item']]], ['remove_5fqueue_5fitem',['remove_queue_item',['../queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24',1,'queue_fn.php']]], ['removeme_2ephp',['removeme.php',['../removeme_8php.html',1,'']]], diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index 90fb7f934..220469521 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -2,8 +2,8 @@ var searchData= [ ['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]], ['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]], - ['tagadelic',['tagadelic',['../taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'taxonomy.php']]], - ['tagblock',['tagblock',['../taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'taxonomy.php']]], + ['tagadelic',['tagadelic',['../taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4',1,'taxonomy.php']]], + ['tagblock',['tagblock',['../taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f',1,'taxonomy.php']]], ['tagger_2ephp',['tagger.php',['../tagger_8php.html',1,'']]], ['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]], ['tagrm_2ephp',['tagrm.php',['../tagrm_8php.html',1,'']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 19525a84d..43c48a5c0 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -68,7 +68,7 @@ var searchData= ['consume_5ffeed',['consume_feed',['../items_8php.html#a8794863cdf8ce1333040933d3a3f66bd',1,'items.php']]], ['contact_5fblock',['contact_block',['../text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784',1,'text.php']]], ['contact_5fpoll_5finterval',['contact_poll_interval',['../contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f',1,'contact_selectors.php']]], - ['contact_5fprofile_5fassign',['contact_profile_assign',['../contact__selectors_8php.html#aba7a4db18efa41d78bed1076b2d59886',1,'contact_selectors.php']]], + ['contact_5fprofile_5fassign',['contact_profile_assign',['../contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75',1,'contact_selectors.php']]], ['contact_5fremove',['contact_remove',['../Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6',1,'Contact.php']]], ['contact_5freputation',['contact_reputation',['../contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53',1,'contact_selectors.php']]], ['contact_5fselect',['contact_select',['../acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91',1,'acl_selectors.php']]], diff --git a/doc/html/search/functions_6f.js b/doc/html/search/functions_6f.js index ba27387c7..e9dff92d6 100644 --- a/doc/html/search/functions_6f.js +++ b/doc/html/search/functions_6f.js @@ -1,6 +1,8 @@ var searchData= [ ['oauth_5fget_5fclient',['oauth_get_client',['../mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117',1,'api.php']]], + ['obj_5fverb_5fselector',['obj_verb_selector',['../taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2',1,'taxonomy.php']]], + ['obj_5fverbs',['obj_verbs',['../taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce',1,'taxonomy.php']]], ['oe_5fbuild_5fxpath',['oe_build_xpath',['../include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319',1,'oembed.php']]], ['oe_5fget_5finner_5fhtml',['oe_get_inner_html',['../include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487',1,'oembed.php']]], ['oembed_5fbbcode2html',['oembed_bbcode2html',['../include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2',1,'oembed.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index a29a9886d..c0094dcc5 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -66,7 +66,7 @@ var searchData= ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]], ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67',1,'boot.php']]], ['profile_5finit',['profile_init',['../profile_8php.html#ab5d0246be0552e2182a585c1206d22a5',1,'profile.php']]], - ['profile_5fload',['profile_load',['../boot_8php.html#aebc5ed38c73ade57f360471da712ded2',1,'boot.php']]], + ['profile_5fload',['profile_load',['../boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'boot.php']]], ['profile_5fphoto_5faside',['profile_photo_aside',['../profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3',1,'profile_photo.php']]], ['profile_5fphoto_5finit',['profile_photo_init',['../profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02',1,'profile_photo.php']]], ['profile_5fphoto_5fpost',['profile_photo_post',['../profile__photo_8php.html#a4b80234074bd603221aa5364f330e479',1,'profile_photo.php']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index 71a7001ff..bfb0b9a2d 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -28,6 +28,7 @@ var searchData= ['remote_5fuser',['remote_user',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]], ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]], ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]], + ['remove_5fcommunity_5ftag',['remove_community_tag',['../zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10',1,'zot.php']]], ['remove_5fparent',['remove_parent',['../classItem.html#aa452b5bcd8dea12119b09212c615cb41',1,'Item']]], ['remove_5fqueue_5fitem',['remove_queue_item',['../queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24',1,'queue_fn.php']]], ['removeme_5fcontent',['removeme_content',['../removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c',1,'removeme.php']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index 9b46593ef..8bf65fac0 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -2,8 +2,8 @@ var searchData= [ ['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]], ['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]], - ['tagadelic',['tagadelic',['../taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'taxonomy.php']]], - ['tagblock',['tagblock',['../taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'taxonomy.php']]], + ['tagadelic',['tagadelic',['../taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4',1,'taxonomy.php']]], + ['tagblock',['tagblock',['../taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f',1,'taxonomy.php']]], ['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]], ['tagrm_5fcontent',['tagrm_content',['../tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a',1,'tagrm.php']]], ['tagrm_5fpost',['tagrm_post',['../tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78',1,'tagrm.php']]], diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index f1d05bd2b..dbf05996f 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -126,12 +126,16 @@ Functions    format_term_for_display ($term)   - tagadelic ($uid, $count=0, $type=TERM_HASHTAG) -  + tagadelic ($uid, $count=0, $authors= '', $flags=0, $type=TERM_HASHTAG) +   tags_sort ($a, $b)   - tagblock ($link, $uid, $count=0, $type=TERM_HASHTAG) -  + tagblock ($link, $uid, $count=0, $authors= '', $flags=0, $type=TERM_HASHTAG) +  + obj_verbs () +  + obj_verb_selector () + 

    Function Documentation

    @@ -244,6 +248,41 @@ Functions

    Referenced by conversation(), item_getfeedtags(), prepare_body(), tag_deliver(), and tgroup_check().

    + + + +
    +
    + + + + + + + +
    obj_verb_selector ()
    +
    + +

    Referenced by thing_content().

    + +
    +
    + +
    +
    + + + + + + + +
    obj_verbs ()
    +
    +

    verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" We use the first person form when creating an activity, but the third person for use in activities FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.

    + +

    Referenced by advanced_profile(), obj_verb_selector(), and thing_init().

    +
    @@ -294,11 +333,11 @@ Functions
    -

    Referenced by filer_content(), and tag_deliver().

    +

    Referenced by filer_content(), tag_deliver(), and tagger_content().

    - +
    @@ -314,6 +353,18 @@ Functions + + + + + + + + + + + + @@ -328,11 +379,11 @@ Functions
      $count = 0,
     $authors = '',
     $flags = 0,
    -

    Referenced by tagblock().

    +

    Referenced by tagblock().

    - +
    @@ -354,6 +405,18 @@ Functions + + + + + + + + + + + + @@ -368,6 +431,8 @@ Functions
      $count = 0,
     $authors = '',
     $flags = 0,
    +

    Referenced by channel_aside().

    +
    diff --git a/doc/html/taxonomy_8php.js b/doc/html/taxonomy_8php.js index 3b22e6d3f..53df8721b 100644 --- a/doc/html/taxonomy_8php.js +++ b/doc/html/taxonomy_8php.js @@ -5,9 +5,11 @@ var taxonomy_8php = [ "file_tag_file_query", "taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1", null ], [ "format_term_for_display", "taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1", null ], [ "get_terms_oftype", "taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1", null ], + [ "obj_verb_selector", "taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2", null ], + [ "obj_verbs", "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce", null ], [ "store_item_tag", "taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd", null ], - [ "tagadelic", "taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d", null ], - [ "tagblock", "taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6", null ], + [ "tagadelic", "taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4", null ], + [ "tagblock", "taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f", null ], [ "tags_sort", "taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43", null ], [ "term_query", "taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c", null ] ]; \ No newline at end of file diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 85adf77e2..d05ecb275 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -298,7 +298,7 @@ Variables
    -

    Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), get_atom_elements(), item_post_type(), like_puller(), localize_item(), process_delivery(), and visible_activity().

    +

    Referenced by Item\add_child(), Conversation\add_thread(), consume_feed(), conversation(), get_atom_elements(), item_post_type(), like_puller(), localize_item(), process_delivery(), remove_community_tag(), and visible_activity().

    @@ -866,7 +866,7 @@ Variables
    -

    Referenced by localize_item().

    +

    Referenced by localize_item(), remove_community_tag(), and tag_deliver().

    @@ -1120,7 +1120,7 @@ Variables
    -

    Referenced by account_verify_password(), Item\add_child(), Conversation\add_thread(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), base64url_decode(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), display_content(), email_send(), encode_item(), encode_mail(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_delivery(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), redir_init(), register_content(), reload_plugins(), Item\remove_child(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_imported_item(), update_queue_time(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by account_verify_password(), Item\add_child(), Conversation\add_thread(), advanced_profile(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), base64url_decode(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), display_content(), email_send(), encode_item(), encode_mail(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_delivery(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), redir_init(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_imported_item(), update_queue_time(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    @@ -1577,7 +1577,7 @@ Variables
    Returns
    string substituted string
    -

    Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), directory_content(), dirfind_content(), display_content(), editpost_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), message_aside(), message_content(), micropro(), mini_group_select(), mood_content(), nav(), network_content(), new_channel_content(), new_follower(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), suggest_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), and xrd_init().

    +

    Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), allfriends_content(), alt_pager(), api_apply_template(), api_content(), apps_content(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connections_content(), construct_page(), contact_block(), conversation(), crepair_content(), delegate_content(), directory_content(), dirfind_content(), display_content(), editpost_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), findpeople_widget(), follow_widget(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), intro_content(), invite_content(), lang_selector(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), message_aside(), message_content(), micropro(), mini_group_select(), mood_content(), nav(), network_content(), new_channel_content(), new_follower(), nogroup_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profile_tabs(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), saved_searches(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), suggest_content(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), and xrd_init().

    @@ -1743,7 +1743,7 @@ Variables
    -

    Referenced by expand_groups(), identity_basic_export(), lockview_content(), notifier_run(), and zot_import().

    +

    Referenced by expand_groups(), identity_basic_export(), lockview_content(), notifier_run(), tagadelic(), and zot_import().

    diff --git a/doc/html/thing_8php.html b/doc/html/thing_8php.html index b6183f78e..1ef632d27 100644 --- a/doc/html/thing_8php.html +++ b/doc/html/thing_8php.html @@ -147,6 +147,10 @@ Functions
    +

    verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" We use the first person form when creating an activity, but the third person for use in activities FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.

    +

    The site administrator can do things that normals cannot. This is restricted because it will likely cause an activitystreams protocol violation and the activity might choke in some other network and result in unnecessary support requests. It isn't because we're trying to be heavy-handed about what you can and can't do.

    +

    Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators That needs to be specified in your thing. e.g. Mike has "a carrot", Greg wants "balls", Bob likes "the Boston Red Sox".

    +

    Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile.

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 840499676..0c1618828 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allfriends_content(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), apps_content(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_aside(), channel_content(), channel_init(), channel_remove(), chanview_content(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_select(), conversation(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), dfrn_deliver(), directory_aside(), directory_content(), directory_init(), dirfind_content(), dirfind_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), help_content(), hostxrd_init(), import_channel_photo(), import_content(), import_post(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), local_delivery(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), message_aside(), message_content(), message_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), new_follower(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onepoll_run(), opensearch_init(), page_content(), paginate(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), redbasic_init(), redir_init(), redstrap_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), saved_searches(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), smilies(), subthread_content(), suggest_aside(), suggest_content(), t(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), terminate_friendship(), tgroup_check(), theme_content(), theme_include(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), wall_upload_post(), wfinger_init(), what_next(), xrd_init(), z_fetch_url(), z_path(), z_root(), zid_init(), and zotfeed_init().

    +

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allfriends_content(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), apps_content(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_aside(), channel_content(), channel_init(), channel_remove(), chanview_content(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_select(), conversation(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), dfrn_deliver(), directory_aside(), directory_content(), directory_init(), dirfind_content(), dirfind_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editpost_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), help_content(), hostxrd_init(), import_channel_photo(), import_content(), import_post(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), local_delivery(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), message_aside(), message_content(), message_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), new_follower(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onepoll_run(), opensearch_init(), page_content(), paginate(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), redbasic_init(), redir_init(), redstrap_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), saved_searches(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_aside(), settings_post(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), smilies(), subthread_content(), suggest_aside(), suggest_content(), t(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), terminate_friendship(), tgroup_check(), theme_content(), theme_include(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), wall_upload_post(), wfinger_init(), what_next(), xrd_init(), z_fetch_url(), z_path(), z_root(), zid_init(), and zotfeed_init().

    diff --git a/doc/html/typohelper_8php.html b/doc/html/typohelper_8php.html index ff0de04c5..694dc6711 100644 --- a/doc/html/typohelper_8php.html +++ b/doc/html/typohelper_8php.html @@ -130,7 +130,7 @@ Variables Initial value:
    = <<< EOT
    error_reporting(E_ERROR | E_WARNING | E_PARSE )
    -

    Referenced by api_date(), check_php(), check_webbie(), dbesc(), dba_mysql\escape(), dba_mysqli\escape(), head_get_css(), head_get_js(), item_store_update(), load_database(), photos_album_get_db_idstr(), photos_post(), posted_dates(), relative_date(), stream_perms_api_uids(), and xmlify().

    +

    Referenced by api_date(), check_php(), check_webbie(), dbesc(), dba_mysql\escape(), dba_mysqli\escape(), head_get_css(), head_get_js(), item_store_update(), load_database(), photos_album_get_db_idstr(), photos_post(), posted_dates(), relative_date(), stream_perms_api_uids(), thing_init(), and xmlify().

    diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 93fb59fd4..394aa007c 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -142,6 +142,8 @@ Functions    process_delivery ($sender, $arr, $deliveries, $relay)   + remove_community_tag ($sender, $arr, $uid) +   update_imported_item ($sender, $item, $uid)    delete_imported_item ($sender, $item, $uid) @@ -408,6 +410,40 @@ Functions

    Referenced by allowed_public_recips().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    remove_community_tag ( $sender,
     $arr,
     $uid 
    )
    +
    + +

    Referenced by process_delivery().

    +
    diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 4f767358d..0d7a1b690 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -9,6 +9,7 @@ var zot_8php = [ "process_mail_delivery", "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc", null ], [ "process_profile_delivery", "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b", null ], [ "public_recips", "zot_8php.html#a083aec6c900d244e1bfc1406f9461465", null ], + [ "remove_community_tag", "zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10", null ], [ "update_imported_item", "zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df", null ], [ "update_modtime", "zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab", null ], [ "zot_build_packet", "zot_8php.html#a3862b3161b2c8557dc1a95020179bd81", null ], diff --git a/mod/connections.php b/mod/connections.php index 89c0bcbc0..1b97412d4 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -23,6 +23,11 @@ function connections_init(&$a) { $a->data['abook'] = $r[0]; } } + + $channel = $a->get_channel(); + if($channel) + head_set_icon($channel['xchan_photo_s']); + } function connections_aside(&$a) { diff --git a/mod/message.php b/mod/message.php index 54615f081..f5a2101ab 100644 --- a/mod/message.php +++ b/mod/message.php @@ -206,6 +206,7 @@ function message_content(&$a) { } $channel = $a->get_channel(); + head_set_icon($channel['xchan_photo_s']); $tpl = get_markup_template('mail_head.tpl'); $header = replace_macros($tpl, array( diff --git a/mod/network.php b/mod/network.php index aa134eece..0f4b4f7e8 100644 --- a/mod/network.php +++ b/mod/network.php @@ -7,6 +7,9 @@ function network_init(&$a) { notice( t('Permission denied.') . EOL); return; } + + $channel = $a->get_channel(); + head_set_icon($channel['xchan_photo_s']); $is_a_date_query = false; diff --git a/mod/settings.php b/mod/settings.php index e830d7070..164a2a8a0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -580,6 +580,11 @@ function settings_content(&$a) { return; } + + $channel = $a->get_channel(); + if($channel) + head_set_icon($channel['xchan_photo_s']); + // if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) { // notice( t('Permission denied.') . EOL ); // return; diff --git a/util/messages.po b/util/messages.po index 982efc247..e3b0c86c6 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-28 00:01-0700\n" +"POT-Creation-Date: 2013-07-05 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -243,7 +243,7 @@ msgid "Please visit %s to approve or reject the suggestion." msgstr "" #: ../../include/Contact.php:53 ../../include/contact_widgets.php:9 -#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../boot.php:1578 +#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../boot.php:1579 msgid "Connect" msgstr "" @@ -285,92 +285,92 @@ msgstr "" msgid "Send PM" msgstr "" -#: ../../include/contact_selectors.php:32 +#: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "" -#: ../../include/contact_selectors.php:33 +#: ../../include/contact_selectors.php:31 msgid "Block immediately" msgstr "" -#: ../../include/contact_selectors.php:34 +#: ../../include/contact_selectors.php:32 msgid "Shady, spammer, self-marketer" msgstr "" -#: ../../include/contact_selectors.php:35 +#: ../../include/contact_selectors.php:33 msgid "Known to me, but no opinion" msgstr "" -#: ../../include/contact_selectors.php:36 +#: ../../include/contact_selectors.php:34 msgid "OK, probably harmless" msgstr "" -#: ../../include/contact_selectors.php:37 +#: ../../include/contact_selectors.php:35 msgid "Reputable, has my trust" msgstr "" -#: ../../include/contact_selectors.php:56 +#: ../../include/contact_selectors.php:54 msgid "Frequently" msgstr "" -#: ../../include/contact_selectors.php:57 +#: ../../include/contact_selectors.php:55 msgid "Hourly" msgstr "" -#: ../../include/contact_selectors.php:58 +#: ../../include/contact_selectors.php:56 msgid "Twice daily" msgstr "" -#: ../../include/contact_selectors.php:59 +#: ../../include/contact_selectors.php:57 msgid "Daily" msgstr "" -#: ../../include/contact_selectors.php:60 +#: ../../include/contact_selectors.php:58 msgid "Weekly" msgstr "" -#: ../../include/contact_selectors.php:61 +#: ../../include/contact_selectors.php:59 msgid "Monthly" msgstr "" -#: ../../include/contact_selectors.php:76 +#: ../../include/contact_selectors.php:74 msgid "Friendica" msgstr "" -#: ../../include/contact_selectors.php:77 +#: ../../include/contact_selectors.php:75 msgid "OStatus" msgstr "" -#: ../../include/contact_selectors.php:78 +#: ../../include/contact_selectors.php:76 msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:624 +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:624 #: ../../mod/admin.php:633 ../../boot.php:1323 msgid "Email" msgstr "" -#: ../../include/contact_selectors.php:80 +#: ../../include/contact_selectors.php:78 msgid "Diaspora" msgstr "" -#: ../../include/contact_selectors.php:81 +#: ../../include/contact_selectors.php:79 msgid "Facebook" msgstr "" -#: ../../include/contact_selectors.php:82 +#: ../../include/contact_selectors.php:80 msgid "Zot!" msgstr "" -#: ../../include/contact_selectors.php:83 +#: ../../include/contact_selectors.php:81 msgid "LinkedIn" msgstr "" -#: ../../include/contact_selectors.php:84 +#: ../../include/contact_selectors.php:82 msgid "XMPP/IM" msgstr "" -#: ../../include/contact_selectors.php:85 +#: ../../include/contact_selectors.php:83 msgid "MySpace" msgstr "" @@ -410,7 +410,7 @@ msgid "Examples: Robert Morgenstein, Fishing" msgstr "" #: ../../include/contact_widgets.php:33 ../../mod/directory.php:160 -#: ../../mod/directory.php:165 ../../mod/connections.php:651 +#: ../../mod/directory.php:165 ../../mod/connections.php:652 msgid "Find" msgstr "" @@ -450,7 +450,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/contact_widgets.php:126 ../../include/js_strings.php:7 -#: ../../include/ItemObject.php:273 +#: ../../include/ItemObject.php:269 msgid "show more" msgstr "" @@ -545,7 +545,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:448 ../../mod/directory.php:116 ../../boot.php:1632 +#: ../../mod/events.php:448 ../../mod/directory.php:116 ../../boot.php:1633 msgid "Location:" msgstr "" @@ -730,6 +730,14 @@ msgstr "" msgid "Ability to mark special posts with a star indicator" msgstr "" +#: ../../include/features.php:61 +msgid "Tag Cloud" +msgstr "" + +#: ../../include/features.php:61 +msgid "Provide a personal tag cloud on your channel page" +msgstr "" + #: ../../include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -773,9 +781,9 @@ msgstr "" msgid "Delete this item?" msgstr "" -#: ../../include/js_strings.php:6 ../../include/ItemObject.php:544 -#: ../../mod/photos.php:1061 ../../mod/photos.php:1099 -#: ../../mod/photos.php:1126 +#: ../../include/js_strings.php:6 ../../include/ItemObject.php:540 +#: ../../mod/photos.php:1055 ../../mod/photos.php:1093 +#: ../../mod/photos.php:1120 msgid "Comment" msgstr "" @@ -887,14 +895,14 @@ msgstr "" #: ../../include/photo/photo_driver.php:495 #: ../../include/photo/photo_driver.php:502 #: ../../include/photo/photo_driver.php:509 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:751 ../../mod/photos.php:773 +#: ../../mod/photos.php:97 ../../mod/photos.php:748 ../../mod/photos.php:770 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:93 #: ../../mod/profile_photo.php:98 ../../mod/profile_photo.php:223 #: ../../mod/profile_photo.php:323 ../../mod/profile_photo.php:332 msgid "Profile Photos" msgstr "" -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118 #: ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -904,7 +912,7 @@ msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:118 -#: ../../boot.php:1634 +#: ../../boot.php:1635 msgid "Gender:" msgstr "" @@ -925,7 +933,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:120 -#: ../../boot.php:1635 +#: ../../boot.php:1636 msgid "Status:" msgstr "" @@ -934,16 +942,16 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:543 +#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549 msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:122 -#: ../../boot.php:1636 +#: ../../boot.php:1637 msgid "Homepage:" msgstr "" -#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:545 +#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551 msgid "Hometown:" msgstr "" @@ -951,7 +959,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:546 +#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552 msgid "Political Views:" msgstr "" @@ -967,11 +975,11 @@ msgstr "" msgid "Hobbies/Interests:" msgstr "" -#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:549 +#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555 msgid "Likes:" msgstr "" -#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:550 +#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556 msgid "Dislikes:" msgstr "" @@ -1076,7 +1084,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2027 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2028 msgid "Photos" msgstr "" @@ -1174,7 +1182,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:151 ../../mod/connections.php:537 +#: ../../include/nav.php:151 ../../mod/connections.php:538 msgid "New Connections" msgstr "" @@ -1226,7 +1234,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:167 ../../mod/events.php:346 ../../boot.php:2038 +#: ../../include/nav.php:167 ../../mod/events.php:346 ../../boot.php:2039 msgid "Events" msgstr "" @@ -1259,7 +1267,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:175 ../../mod/connections.php:645 +#: ../../include/nav.php:175 ../../mod/connections.php:646 msgid "Connections" msgstr "" @@ -1304,23 +1312,23 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:4455 +#: ../../include/attach.php:464 ../../include/items.php:4494 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:99 ../../mod/allfriends.php:10 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/setup.php:181 ../../mod/settings.php:579 #: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 #: ../../mod/delegate.php:6 ../../mod/group.php:15 ../../mod/photos.php:74 -#: ../../mod/photos.php:639 ../../mod/viewsrc.php:12 ../../mod/message.php:204 +#: ../../mod/photos.php:642 ../../mod/viewsrc.php:12 ../../mod/message.php:204 #: ../../mod/item.php:150 ../../mod/network.php:7 ../../mod/intro.php:50 #: ../../mod/connections.php:160 ../../mod/profiles.php:163 -#: ../../mod/profiles.php:471 ../../mod/new_channel.php:66 +#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6 #: ../../mod/crepair.php:115 ../../mod/nogroup.php:25 #: ../../mod/profile_photo.php:185 ../../mod/profile_photo.php:198 #: ../../mod/notifications.php:66 ../../mod/editpost.php:10 -#: ../../mod/poke.php:128 ../../mod/channel.php:105 ../../mod/fsuggest.php:78 +#: ../../mod/poke.php:128 ../../mod/channel.php:108 ../../mod/fsuggest.php:78 #: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 -#: ../../mod/mood.php:111 ../../index.php:175 ../../index.php:337 +#: ../../mod/mood.php:111 ../../index.php:178 ../../index.php:340 msgid "Permission denied." msgstr "" @@ -1341,12 +1349,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:276 ../../boot.php:2030 +#: ../../include/photos.php:276 ../../boot.php:2031 msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:280 ../../mod/photos.php:789 -#: ../../mod/photos.php:1288 +#: ../../include/photos.php:280 ../../mod/photos.php:786 +#: ../../mod/photos.php:1268 msgid "Upload New Photos" msgstr "" @@ -1617,7 +1625,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:266 ../../include/account.php:293 -#: ../../include/account.php:350 ../../include/items.php:3980 +#: ../../include/account.php:350 ../../include/items.php:4019 #: ../../boot.php:1161 msgid "Administrator" msgstr "" @@ -1861,144 +1869,144 @@ msgstr "" msgid "surprised" msgstr "" -#: ../../include/text.php:942 +#: ../../include/text.php:940 msgid "Monday" msgstr "" -#: ../../include/text.php:942 +#: ../../include/text.php:940 msgid "Tuesday" msgstr "" -#: ../../include/text.php:942 +#: ../../include/text.php:940 msgid "Wednesday" msgstr "" -#: ../../include/text.php:942 +#: ../../include/text.php:940 msgid "Thursday" msgstr "" -#: ../../include/text.php:942 +#: ../../include/text.php:940 msgid "Friday" msgstr "" -#: ../../include/text.php:942 +#: ../../include/text.php:940 msgid "Saturday" msgstr "" -#: ../../include/text.php:942 +#: ../../include/text.php:940 msgid "Sunday" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "January" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "February" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "March" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "April" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "May" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "June" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "July" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "August" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "September" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "October" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "November" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:944 msgid "December" msgstr "" -#: ../../include/text.php:1019 +#: ../../include/text.php:1017 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1020 +#: ../../include/text.php:1018 msgid "bytes" msgstr "" -#: ../../include/text.php:1051 ../../include/text.php:1066 +#: ../../include/text.php:1049 ../../include/text.php:1064 #: ../../include/conversation.php:805 msgid "remove" msgstr "" -#: ../../include/text.php:1051 ../../include/text.php:1066 +#: ../../include/text.php:1049 ../../include/text.php:1064 msgid "[remove]" msgstr "" -#: ../../include/text.php:1054 ../../include/conversation.php:667 +#: ../../include/text.php:1052 ../../include/conversation.php:667 msgid "Categories:" msgstr "" -#: ../../include/text.php:1069 ../../include/conversation.php:668 +#: ../../include/text.php:1067 ../../include/conversation.php:668 msgid "Filed under:" msgstr "" -#: ../../include/text.php:1085 ../../include/text.php:1097 +#: ../../include/text.php:1083 ../../include/text.php:1095 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1249 ../../mod/events.php:324 +#: ../../include/text.php:1247 ../../mod/events.php:324 msgid "link to source" msgstr "" -#: ../../include/text.php:1281 +#: ../../include/text.php:1279 msgid "default" msgstr "" -#: ../../include/text.php:1293 +#: ../../include/text.php:1291 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1445 ../../include/conversation.php:115 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:43 +#: ../../include/text.php:1443 ../../include/conversation.php:115 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "" -#: ../../include/text.php:1448 ../../include/conversation.php:118 -#: ../../mod/tagger.php:47 +#: ../../include/text.php:1446 ../../include/conversation.php:118 +#: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1451 ../../include/conversation.php:143 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:51 +#: ../../include/text.php:1449 ../../include/conversation.php:143 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "" -#: ../../include/text.php:1453 ../../include/conversation.php:145 -#: ../../mod/tagger.php:53 +#: ../../include/text.php:1451 ../../include/conversation.php:145 +#: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1458 +#: ../../include/text.php:1456 msgid "activity" msgstr "" @@ -2118,6 +2126,42 @@ msgstr "" msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" +#: ../../include/taxonomy.php:166 +msgid "Tags" +msgstr "" + +#: ../../include/taxonomy.php:187 +msgid "have" +msgstr "" + +#: ../../include/taxonomy.php:187 +msgid "has" +msgstr "" + +#: ../../include/taxonomy.php:188 +msgid "want" +msgstr "" + +#: ../../include/taxonomy.php:188 +msgid "wants" +msgstr "" + +#: ../../include/taxonomy.php:189 ../../include/ItemObject.php:179 +msgid "like" +msgstr "" + +#: ../../include/taxonomy.php:189 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:190 ../../include/ItemObject.php:180 +msgid "dislike" +msgstr "" + +#: ../../include/taxonomy.php:190 +msgid "dislikes" +msgstr "" + #: ../../include/attach.php:184 ../../include/attach.php:232 msgid "Item was not found." msgstr "" @@ -2151,168 +2195,161 @@ msgstr "" msgid "Path not available." msgstr "" -#: ../../include/ItemObject.php:109 ../../mod/photos.php:928 +#: ../../include/ItemObject.php:100 ../../mod/photos.php:928 msgid "Private Message" msgstr "" -#: ../../include/ItemObject.php:114 ../../mod/settings.php:659 +#: ../../include/ItemObject.php:105 ../../mod/settings.php:659 #: ../../mod/editpost.php:66 msgid "Edit" msgstr "" -#: ../../include/ItemObject.php:127 ../../include/conversation.php:630 +#: ../../include/ItemObject.php:118 ../../include/conversation.php:630 #: ../../mod/settings.php:660 ../../mod/group.php:177 -#: ../../mod/photos.php:1154 ../../mod/admin.php:628 +#: ../../mod/photos.php:1148 ../../mod/admin.php:628 #: ../../mod/connections.php:329 msgid "Delete" msgstr "" -#: ../../include/ItemObject.php:133 ../../include/conversation.php:629 +#: ../../include/ItemObject.php:124 ../../include/conversation.php:629 msgid "Select" msgstr "" -#: ../../include/ItemObject.php:137 +#: ../../include/ItemObject.php:128 msgid "save to folder" msgstr "" -#: ../../include/ItemObject.php:164 +#: ../../include/ItemObject.php:156 msgid "add star" msgstr "" -#: ../../include/ItemObject.php:165 +#: ../../include/ItemObject.php:157 msgid "remove star" msgstr "" -#: ../../include/ItemObject.php:166 +#: ../../include/ItemObject.php:158 msgid "toggle star status" msgstr "" -#: ../../include/ItemObject.php:170 +#: ../../include/ItemObject.php:162 msgid "starred" msgstr "" -#: ../../include/ItemObject.php:174 +#: ../../include/ItemObject.php:173 msgid "add tag" msgstr "" -#: ../../include/ItemObject.php:183 ../../mod/photos.php:1041 +#: ../../include/ItemObject.php:179 ../../mod/photos.php:1035 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:183 -msgid "like" -msgstr "" - -#: ../../include/ItemObject.php:184 ../../mod/photos.php:1042 +#: ../../include/ItemObject.php:180 ../../mod/photos.php:1036 msgid "I don't like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:184 -msgid "dislike" -msgstr "" - -#: ../../include/ItemObject.php:186 +#: ../../include/ItemObject.php:182 msgid "Share this" msgstr "" -#: ../../include/ItemObject.php:186 +#: ../../include/ItemObject.php:182 msgid "share" msgstr "" -#: ../../include/ItemObject.php:210 ../../include/ItemObject.php:211 +#: ../../include/ItemObject.php:206 ../../include/ItemObject.php:207 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../include/ItemObject.php:212 +#: ../../include/ItemObject.php:208 msgid "to" msgstr "" -#: ../../include/ItemObject.php:213 +#: ../../include/ItemObject.php:209 msgid "Wall-to-Wall" msgstr "" -#: ../../include/ItemObject.php:214 +#: ../../include/ItemObject.php:210 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:224 ../../include/conversation.php:677 +#: ../../include/ItemObject.php:220 ../../include/conversation.php:677 #, php-format msgid " from %s" msgstr "" -#: ../../include/ItemObject.php:251 ../../include/conversation.php:696 -#: ../../include/conversation.php:1052 ../../mod/photos.php:1044 +#: ../../include/ItemObject.php:247 ../../include/conversation.php:696 +#: ../../include/conversation.php:1052 ../../mod/photos.php:1038 #: ../../mod/message.php:296 ../../mod/message.php:429 #: ../../mod/editpost.php:75 msgid "Please wait" msgstr "" -#: ../../include/ItemObject.php:272 +#: ../../include/ItemObject.php:268 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:542 ../../mod/photos.php:1059 -#: ../../mod/photos.php:1097 ../../mod/photos.php:1124 +#: ../../include/ItemObject.php:538 ../../mod/photos.php:1053 +#: ../../mod/photos.php:1091 ../../mod/photos.php:1118 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:545 ../../mod/events.php:456 -#: ../../mod/invite.php:138 ../../mod/setup.php:283 ../../mod/setup.php:326 -#: ../../mod/settings.php:597 ../../mod/settings.php:709 -#: ../../mod/settings.php:737 ../../mod/settings.php:761 -#: ../../mod/settings.php:832 ../../mod/settings.php:999 -#: ../../mod/group.php:83 ../../mod/photos.php:674 ../../mod/photos.php:766 -#: ../../mod/photos.php:1023 ../../mod/photos.php:1062 -#: ../../mod/photos.php:1100 ../../mod/photos.php:1127 -#: ../../mod/message.php:297 ../../mod/message.php:428 ../../mod/admin.php:397 -#: ../../mod/admin.php:621 ../../mod/admin.php:757 ../../mod/admin.php:956 -#: ../../mod/admin.php:1043 ../../mod/connections.php:406 -#: ../../mod/profiles.php:523 ../../mod/import.php:351 -#: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 -#: ../../mod/mood.php:134 ../../view/theme/redbasic/php/config.php:132 +#: ../../include/ItemObject.php:541 ../../mod/events.php:456 +#: ../../mod/thing.php:190 ../../mod/invite.php:138 ../../mod/setup.php:283 +#: ../../mod/setup.php:326 ../../mod/settings.php:597 +#: ../../mod/settings.php:709 ../../mod/settings.php:737 +#: ../../mod/settings.php:761 ../../mod/settings.php:832 +#: ../../mod/settings.php:999 ../../mod/group.php:83 ../../mod/photos.php:673 +#: ../../mod/photos.php:763 ../../mod/photos.php:1017 +#: ../../mod/photos.php:1056 ../../mod/photos.php:1094 +#: ../../mod/photos.php:1121 ../../mod/message.php:297 +#: ../../mod/message.php:428 ../../mod/admin.php:397 ../../mod/admin.php:621 +#: ../../mod/admin.php:757 ../../mod/admin.php:956 ../../mod/admin.php:1043 +#: ../../mod/connections.php:406 ../../mod/profiles.php:529 +#: ../../mod/import.php:351 ../../mod/crepair.php:166 ../../mod/poke.php:166 +#: ../../mod/fsuggest.php:108 ../../mod/mood.php:134 +#: ../../view/theme/redbasic/php/config.php:132 #: ../../view/theme/redbasic/php/config.php:149 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:546 +#: ../../include/ItemObject.php:542 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:547 +#: ../../include/ItemObject.php:543 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:548 +#: ../../include/ItemObject.php:544 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:549 +#: ../../include/ItemObject.php:545 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:550 +#: ../../include/ItemObject.php:546 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:551 +#: ../../include/ItemObject.php:547 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:552 +#: ../../include/ItemObject.php:548 msgid "Link" msgstr "" -#: ../../include/ItemObject.php:553 +#: ../../include/ItemObject.php:549 msgid "Video" msgstr "" -#: ../../include/ItemObject.php:554 ../../include/conversation.php:1070 -#: ../../mod/photos.php:1063 ../../mod/editpost.php:95 +#: ../../include/ItemObject.php:550 ../../include/conversation.php:1070 +#: ../../mod/photos.php:1057 ../../mod/editpost.php:95 msgid "Preview" msgstr "" @@ -2434,7 +2471,7 @@ msgstr "" msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1029 ../../mod/photos.php:1043 +#: ../../include/conversation.php:1029 ../../mod/photos.php:1037 msgid "Share" msgstr "" @@ -2525,51 +2562,51 @@ msgid "Example: bob@example.com, mary@example.com" msgstr "" #: ../../include/items.php:151 ../../mod/like.php:55 ../../mod/group.php:70 -#: ../../mod/profperm.php:28 ../../index.php:336 +#: ../../mod/profperm.php:28 ../../index.php:339 msgid "Permission denied" msgstr "" -#: ../../include/items.php:2508 +#: ../../include/items.php:2547 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/items.php:2509 +#: ../../include/items.php:2548 #, php-format msgid "Happy Birthday %s" msgstr "" -#: ../../include/items.php:3970 +#: ../../include/items.php:4009 msgid "[Name Withheld]" msgstr "" -#: ../../include/items.php:3978 +#: ../../include/items.php:4017 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3978 +#: ../../include/items.php:4017 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:4404 ../../mod/viewsrc.php:18 +#: ../../include/items.php:4443 ../../mod/viewsrc.php:18 #: ../../mod/admin.php:142 ../../mod/admin.php:665 ../../mod/admin.php:864 #: ../../mod/display.php:33 ../../mod/page.php:34 msgid "Item not found." msgstr "" -#: ../../include/items.php:4576 +#: ../../include/items.php:4615 msgid "Archives" msgstr "" -#: ../../include/items.php:4724 ../../mod/group.php:43 ../../mod/group.php:141 +#: ../../include/items.php:4763 ../../mod/group.php:43 ../../mod/group.php:141 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4734 +#: ../../include/items.php:4773 msgid "Collection has no members." msgstr "" -#: ../../include/items.php:4750 +#: ../../include/items.php:4789 msgid "Connection not found." msgstr "" @@ -2654,6 +2691,47 @@ msgstr "" msgid "Share this event" msgstr "" +#: ../../mod/thing.php:109 +msgid "Object store: failed" +msgstr "" + +#: ../../mod/thing.php:113 +msgid "thing/stuff added" +msgstr "" + +#: ../../mod/thing.php:129 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" +msgstr "" + +#: ../../mod/thing.php:175 +msgid "not yet implemented." +msgstr "" + +#: ../../mod/thing.php:181 +msgid "Add Stuff to your Profile" +msgstr "" + +#: ../../mod/thing.php:183 +msgid "Select a profile" +msgstr "" + +#: ../../mod/thing.php:185 +msgid "Select a category of stuff. e.g. I ______ something" +msgstr "" + +#: ../../mod/thing.php:187 +msgid "Name of thing or stuff e.g. something" +msgstr "" + +#: ../../mod/thing.php:188 +msgid "URL of thing or stuff (optional)" +msgstr "" + +#: ../../mod/thing.php:189 +msgid "URL for photo of thing or stuff (optional)" +msgstr "" + #: ../../mod/invite.php:25 msgid "Total invitation limit exceeded." msgstr "" @@ -2781,14 +2859,14 @@ msgstr "" #: ../../mod/api.php:105 ../../mod/settings.php:954 ../../mod/settings.php:959 #: ../../mod/settings.php:982 ../../mod/settings.php:984 #: ../../mod/settings.php:985 ../../mod/settings.php:986 -#: ../../mod/profiles.php:501 +#: ../../mod/profiles.php:506 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/settings.php:954 ../../mod/settings.php:959 #: ../../mod/settings.php:982 ../../mod/settings.php:984 #: ../../mod/settings.php:985 ../../mod/settings.php:986 -#: ../../mod/profiles.php:502 +#: ../../mod/profiles.php:507 msgid "No" msgstr "" @@ -3158,7 +3236,7 @@ msgstr "" msgid "toggle full screen mode" msgstr "" -#: ../../mod/tagger.php:96 +#: ../../mod/tagger.php:98 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -3653,7 +3731,7 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/directory.php:103 ../../mod/profiles.php:578 +#: ../../mod/directory.php:103 ../../mod/profiles.php:584 msgid "Age: " msgstr "" @@ -3737,11 +3815,11 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:125 ../../mod/photos.php:767 +#: ../../mod/photos.php:125 ../../mod/photos.php:764 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:165 ../../mod/photos.php:1024 +#: ../../mod/photos.php:165 ../../mod/photos.php:1018 msgid "Delete Photo" msgstr "" @@ -3772,63 +3850,55 @@ msgstr "" msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:702 +#: ../../mod/photos.php:695 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:706 ../../mod/photos.php:762 +#: ../../mod/photos.php:699 ../../mod/photos.php:759 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:707 +#: ../../mod/photos.php:700 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:708 +#: ../../mod/photos.php:701 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:710 ../../mod/photos.php:1019 +#: ../../mod/photos.php:703 ../../mod/photos.php:1013 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:751 ../../mod/photos.php:773 ../../mod/photos.php:1229 -#: ../../mod/photos.php:1241 +#: ../../mod/photos.php:748 ../../mod/photos.php:770 ../../mod/photos.php:1209 +#: ../../mod/photos.php:1221 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:777 +#: ../../mod/photos.php:774 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:783 +#: ../../mod/photos.php:780 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:785 +#: ../../mod/photos.php:782 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:828 ../../mod/photos.php:1271 +#: ../../mod/photos.php:826 ../../mod/photos.php:1251 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:863 +#: ../../mod/photos.php:864 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:865 +#: ../../mod/photos.php:866 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:921 -msgid "View photo" -msgstr "" - -#: ../../mod/photos.php:921 -msgid "Edit photo" -msgstr "" - #: ../../mod/photos.php:922 msgid "Use as profile photo" msgstr "" @@ -3837,35 +3907,39 @@ msgstr "" msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1009 +#: ../../mod/photos.php:1001 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:1003 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1010 +#: ../../mod/photos.php:1004 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1012 +#: ../../mod/photos.php:1006 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1015 +#: ../../mod/photos.php:1009 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1017 +#: ../../mod/photos.php:1011 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1015 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1277 +#: ../../mod/photos.php:1257 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1286 +#: ../../mod/photos.php:1266 msgid "Recent Photos" msgstr "" @@ -3877,11 +3951,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1683 ../../boot.php:1763 +#: ../../mod/ping.php:230 ../../boot.php:1684 ../../boot.php:1764 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1729 ../../boot.php:1804 +#: ../../mod/ping.php:252 ../../boot.php:1730 ../../boot.php:1805 msgid "[today]" msgstr "" @@ -3984,11 +4058,11 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:38 ../../index.php:223 +#: ../../mod/help.php:38 ../../index.php:226 msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:226 +#: ../../mod/help.php:41 ../../index.php:229 msgid "Page not found." msgstr "" @@ -4048,7 +4122,7 @@ msgstr "" msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/network.php:311 ../../mod/connections.php:505 +#: ../../mod/network.php:311 ../../mod/connections.php:506 msgid "New" msgstr "" @@ -4529,12 +4603,12 @@ msgid "Deny" msgstr "" #: ../../mod/admin.php:629 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:303 ../../mod/connections.php:443 +#: ../../mod/connections.php:303 ../../mod/connections.php:444 msgid "Block" msgstr "" #: ../../mod/admin.php:630 ../../mod/connections.php:303 -#: ../../mod/connections.php:443 +#: ../../mod/connections.php:444 msgid "Unblock" msgstr "" @@ -4634,7 +4708,7 @@ msgid "Log level" msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:310 ../../mod/connections.php:444 +#: ../../mod/connections.php:310 ../../mod/connections.php:445 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 #: ../../mod/notifications.php:206 msgid "Ignore" @@ -4660,7 +4734,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:449 +#: ../../mod/intro.php:95 ../../mod/connections.php:450 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 msgid "Hide this contact from others" msgstr "" @@ -4767,7 +4841,7 @@ msgstr "" msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:310 ../../mod/connections.php:444 +#: ../../mod/connections.php:310 ../../mod/connections.php:445 msgid "Unignore" msgstr "" @@ -4948,105 +5022,105 @@ msgstr "" msgid "Update now" msgstr "" -#: ../../mod/connections.php:445 +#: ../../mod/connections.php:446 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:446 +#: ../../mod/connections.php:447 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:447 +#: ../../mod/connections.php:448 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:448 +#: ../../mod/connections.php:449 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:449 +#: ../../mod/connections.php:450 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/connections.php:485 ../../mod/connections.php:556 +#: ../../mod/connections.php:486 ../../mod/connections.php:557 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:490 ../../mod/connections.php:563 +#: ../../mod/connections.php:491 ../../mod/connections.php:564 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:495 ../../mod/connections.php:577 +#: ../../mod/connections.php:496 ../../mod/connections.php:578 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:500 ../../mod/connections.php:570 +#: ../../mod/connections.php:501 ../../mod/connections.php:571 msgid "Archived" msgstr "" -#: ../../mod/connections.php:510 +#: ../../mod/connections.php:511 msgid "All" msgstr "" -#: ../../mod/connections.php:531 +#: ../../mod/connections.php:532 msgid "Suggestions" msgstr "" -#: ../../mod/connections.php:534 +#: ../../mod/connections.php:535 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:540 +#: ../../mod/connections.php:541 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:543 +#: ../../mod/connections.php:544 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:546 +#: ../../mod/connections.php:547 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:549 +#: ../../mod/connections.php:550 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:552 +#: ../../mod/connections.php:553 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:559 +#: ../../mod/connections.php:560 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:566 +#: ../../mod/connections.php:567 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:573 +#: ../../mod/connections.php:574 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:580 +#: ../../mod/connections.php:581 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:622 +#: ../../mod/connections.php:623 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:623 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:624 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:649 +#: ../../mod/connections.php:650 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:650 +#: ../../mod/connections.php:651 msgid "Finding: " msgstr "" @@ -5074,7 +5148,7 @@ msgid "Welcome %s. Remote authentication successful." msgstr "" #: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:481 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 msgid "Profile not found." msgstr "" @@ -5098,238 +5172,238 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:312 +#: ../../mod/profiles.php:317 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:316 +#: ../../mod/profiles.php:321 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:320 +#: ../../mod/profiles.php:325 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:324 +#: ../../mod/profiles.php:329 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:328 +#: ../../mod/profiles.php:333 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:331 +#: ../../mod/profiles.php:336 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:335 +#: ../../mod/profiles.php:340 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:339 +#: ../../mod/profiles.php:344 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:343 +#: ../../mod/profiles.php:348 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:347 +#: ../../mod/profiles.php:352 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:351 +#: ../../mod/profiles.php:356 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:355 +#: ../../mod/profiles.php:360 msgid "Address" msgstr "" -#: ../../mod/profiles.php:362 +#: ../../mod/profiles.php:367 msgid "Location" msgstr "" -#: ../../mod/profiles.php:445 +#: ../../mod/profiles.php:450 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:500 +#: ../../mod/profiles.php:505 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:522 +#: ../../mod/profiles.php:528 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:524 +#: ../../mod/profiles.php:530 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:525 +#: ../../mod/profiles.php:531 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:526 +#: ../../mod/profiles.php:532 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:527 +#: ../../mod/profiles.php:533 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:528 +#: ../../mod/profiles.php:534 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:529 +#: ../../mod/profiles.php:535 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:536 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:531 +#: ../../mod/profiles.php:537 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:532 +#: ../../mod/profiles.php:538 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:533 +#: ../../mod/profiles.php:539 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:534 +#: ../../mod/profiles.php:540 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:535 +#: ../../mod/profiles.php:541 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:536 +#: ../../mod/profiles.php:542 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:537 +#: ../../mod/profiles.php:543 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:538 +#: ../../mod/profiles.php:544 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:539 +#: ../../mod/profiles.php:545 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:540 +#: ../../mod/profiles.php:546 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:541 +#: ../../mod/profiles.php:547 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:542 +#: ../../mod/profiles.php:548 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:544 +#: ../../mod/profiles.php:550 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:547 +#: ../../mod/profiles.php:553 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:548 +#: ../../mod/profiles.php:554 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:551 +#: ../../mod/profiles.php:557 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:552 +#: ../../mod/profiles.php:558 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:553 +#: ../../mod/profiles.php:559 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:554 +#: ../../mod/profiles.php:560 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:555 +#: ../../mod/profiles.php:561 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:556 +#: ../../mod/profiles.php:562 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:563 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:564 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:559 +#: ../../mod/profiles.php:565 msgid "Television" msgstr "" -#: ../../mod/profiles.php:560 +#: ../../mod/profiles.php:566 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:561 +#: ../../mod/profiles.php:567 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:562 +#: ../../mod/profiles.php:568 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:569 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:568 +#: ../../mod/profiles.php:574 msgid "" "This is your public profile.
    It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:623 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:618 ../../boot.php:1596 +#: ../../mod/profiles.php:624 ../../boot.php:1597 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:619 ../../boot.php:1603 +#: ../../mod/profiles.php:625 ../../boot.php:1604 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:630 ../../boot.php:1617 +#: ../../mod/profiles.php:636 ../../boot.php:1618 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:633 ../../boot.php:1620 +#: ../../mod/profiles.php:639 ../../boot.php:1621 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:634 ../../boot.php:1621 +#: ../../mod/profiles.php:640 ../../boot.php:1622 msgid "Edit visibility" msgstr "" @@ -5883,11 +5957,11 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/profile.php:8 ../../mod/channel.php:8 ../../boot.php:1493 +#: ../../mod/profile.php:8 ../../mod/channel.php:8 ../../boot.php:1494 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:101 +#: ../../mod/profile.php:111 msgid "Access to this profile has been restricted." msgstr "" @@ -6181,70 +6255,70 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1447 +#: ../../boot.php:1449 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1459 +#: ../../boot.php:1461 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1602 +#: ../../boot.php:1603 msgid "Profiles" msgstr "" -#: ../../boot.php:1602 +#: ../../boot.php:1603 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1606 +#: ../../boot.php:1607 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1684 ../../boot.php:1764 +#: ../../boot.php:1685 ../../boot.php:1765 msgid "F d" msgstr "" -#: ../../boot.php:1741 +#: ../../boot.php:1742 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1742 +#: ../../boot.php:1743 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1797 +#: ../../boot.php:1798 msgid "[No description]" msgstr "" -#: ../../boot.php:1815 +#: ../../boot.php:1816 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1816 +#: ../../boot.php:1817 msgid "Events this week:" msgstr "" -#: ../../boot.php:2013 +#: ../../boot.php:2014 msgid "Channel" msgstr "" -#: ../../boot.php:2016 +#: ../../boot.php:2017 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2020 +#: ../../boot.php:2021 msgid "About" msgstr "" -#: ../../boot.php:2023 +#: ../../boot.php:2024 msgid "Profile Details" msgstr "" -#: ../../boot.php:2041 +#: ../../boot.php:2042 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2267 +#: ../../boot.php:2268 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 7fb3a18be..930d22e86 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-07-04.364 +2013-07-07.367 diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 78e911213..99c2c7868 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -17,7 +17,7 @@ {{$head_js}} - + Date: Mon, 8 Jul 2013 19:21:06 -0700 Subject: [PATCH 11/15] make corner radius configurable in redbasic expert mode --- version.inc | 2 +- view/theme/redbasic/css/style.css | 80 +++++++++++----------- view/theme/redbasic/php/config.php | 8 ++- view/theme/redbasic/php/style.php | 11 ++- view/theme/redbasic/tpl/theme_settings.tpl | 7 +- 5 files changed, 59 insertions(+), 49 deletions(-) diff --git a/version.inc b/version.inc index 930d22e86..cc94e5645 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-07-07.367 +2013-07-08.368 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 16c614cff..c2de29548 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -115,8 +115,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } input { border: 1px solid #666666; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; padding: 3px; } @@ -209,8 +209,8 @@ nav #site-location { border: 1px solid #444; background-color: #ccc; padding: 10px; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } @@ -268,8 +268,8 @@ header #banner #logo-text { border-bottom: 0px; background-color: #aec0d3; color: #565854; - -moz-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx;; } nav .nav-link { @@ -398,7 +398,7 @@ footer { margin-bottom: 5px; font-weight: bold; border: solid 1px #ffffff; - border-radius: 5px; + border-radius: $radiuspx; } #jot-title::-webkit-input-placeholder{font-weight: bold;} @@ -1175,7 +1175,7 @@ footer { padding: 3px 1px 1px 3px; border: 1px solid #ccc; padding: 8px; - border-radius: 5px 5px 5px 5px; + border-radius: $radiuspx; /* box-shadow: 5px 5px 5px #666 inset; */ } @@ -1276,7 +1276,7 @@ footer { height: auto; width: auto; background-color: #0080FF; - border-radius: 5px; + border-radius: $radiuspx; border: 2px outset; box-shadow: 5px 5px 5px #666; margin-right: 8px; @@ -1654,8 +1654,8 @@ border: 1px #111; /* #profile-jot-text_parent, .mceLayout { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } */ @@ -1678,8 +1678,8 @@ tr.mceLast { padding: 8px; margin-right: 0px; width: 90%; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; /* box-shadow: 4px 4px 3px 0 #666 inset; */ } #profile-jot-text:hover { @@ -1687,16 +1687,16 @@ tr.mceLast { } .wall-item-photo, .photo, .contact-block-img, .my-comment-photo { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } #datebrowse-sidebar select { margin-left: 25px; - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; opacity: 0.3; filter:alpha(opacity=30); } @@ -1731,8 +1731,8 @@ tr.mceLast { } .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } @@ -1741,9 +1741,9 @@ tr.mceLast { background-color: #0080FF; color: #eeeeec; font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; border: 2px outset #222420 !important; margin: 0; float: right; @@ -1757,8 +1757,8 @@ tr.mceLast { } .settings-widget .selected { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } @@ -2265,9 +2265,9 @@ aside input[type='text'] { border-bottom: 1px solid #eec; padding: 8px; margin-top: 5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; } @@ -2435,7 +2435,7 @@ aside input[type='text'] { } #nav-user-linkmenu img { - border-radius: 5px; + border-radius: $radiuspx; margin-top: -4px; } @@ -3464,9 +3464,9 @@ nav .nav-menu-icon { height: 22px; padding: 5px; /* margin: 3px 10px; */ - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; } nav .nav-menu-icon.selected { background-color: #FF0000; @@ -3498,9 +3498,9 @@ nav .nav-menu.selected a { nav .nav-notify { background-color: #0080FF; color: #fff; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; opacity: 0.6; filter:alpha(opacity=60); @@ -3643,9 +3643,9 @@ ul.menu-popup { max-height: 400px; overflow-y: scroll;overflow-style:scrollbar; background-color:#FFFFFF; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius:5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; border: 1px solid #888; } #nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } @@ -3711,9 +3711,9 @@ ul.menu-popup { background-position: 7px 7px; background-repeat: no-repeat; padding: 7px 5px 0px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; color: #999999; } #acl-showall.selected { diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 9b1cf1fbd..5917b1e36 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -16,7 +16,9 @@ function theme_content(&$a) { $iconset = get_pconfig(local_user(), 'redbasic', 'iconset'); $shiny = get_pconfig(local_user(), 'redbasic', 'shiny'); $colour_scheme = get_pconfig(local_user(), 'redbasic', 'colour_scheme'); - return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme); + $radius = get_pconfig(local_user(),'redbasic','radius'); + + return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius); } function theme_post(&$a) { @@ -33,6 +35,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']); set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']); set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']); + set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); } } @@ -67,7 +70,7 @@ function theme_post(&$a) { //} // These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode. -function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme) { +function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius) { $line_heights = array( "1.3" => "1.3", "---" => "---", @@ -141,6 +144,7 @@ function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolo '$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours), '$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets), '$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys), + '$radius' => array('redbasic_radius', t('Corner radius'), $radius, t('0-99 default: 5')), ));} if(! feature_enabled(local_user(),'expert')) { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 31b83394f..ec551923a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -17,6 +17,7 @@ $displaystyle = false; $linkcolour = false; $shiny = false; + $radius = 5; $site_line_height = get_config("redbasic","line_height"); $site_redbasic_font_size = get_config("redbasic", "font_size" ); $site_colour = get_config("redbasic", "colour" ); @@ -25,6 +26,10 @@ $displaystyle = get_config("redbasic", "displaystyle" ); $linkcolour = get_config("redbasic", "linkcolour" ); $shiny = get_config("redbasic", "shiny" ); + + $x = get_config('redbasic','radius'); + if($x !== false) + $radius = $x; if (local_user()) { $line_height = get_pconfig(local_user(), "redbasic","line_height"); @@ -35,6 +40,10 @@ $displaystyle = get_pconfig(local_user(), "redbasic", "displaystyle"); $linkcolour = get_pconfig(local_user(), "redbasic", "linkcolour"); $shiny = get_pconfig(local_user(), "redbasic", "shiny"); + $x = get_pconfig(local_user(),'redbasic','radius'); + if($x !== false) + $radius = $x; + if (! feature_enabled(local_user(),'expert')) {$colour_scheme = get_pconfig(local_user(), "redbasic", "colour_scheme");} } @@ -70,7 +79,7 @@ $x = str_replace("\n","",$x); logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG); } - echo $x; + echo str_replace(array('$radius'),array($radius),$x); } echo "\r\n"; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index f8d9f223c..cd980fbc3 100755 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{include file="field_select.tpl" field=$colour}} {{include file="field_input.tpl" field=$font_size}} @@ -21,6 +16,8 @@ {{include file="field_select.tpl" field=$shiny}} +{{include file="field_input.tpl" field=$radius}} +
    From 6e012839c9807ce8c3c97bafdca7a36cf5fc58a9 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Jul 2013 22:01:57 -0700 Subject: [PATCH 12/15] more work on bug #59 - hope this doesn't hork everything. Also some tweaking of the theme for the new radius control, which produced some surprising results when expert mode was toggled. --- include/ConversationObject.php | 30 ++++++-- include/ItemObject.php | 110 ++++++++++-------------------- include/zot.php | 2 +- view/theme/redbasic/css/fancy.css | 12 ++-- view/theme/redbasic/css/style.css | 3 + view/theme/redbasic/php/style.php | 4 +- 6 files changed, 74 insertions(+), 87 deletions(-) diff --git a/include/ConversationObject.php b/include/ConversationObject.php index 7cf39f757..e3b46ca3f 100644 --- a/include/ConversationObject.php +++ b/include/ConversationObject.php @@ -11,12 +11,14 @@ require_once('include/text.php'); /** * A list of threads * - * We should think about making this a SPL Iterator */ + class Conversation extends BaseObject { private $threads = array(); private $mode = null; + private $observer = null; private $writable = false; + private $commentable = false; private $profile_owner = 0; private $preview = false; @@ -34,8 +36,8 @@ class Conversation extends BaseObject { $a = $this->get_app(); - $observer = $a->get_observer(); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $this->observer = $a->get_observer(); + $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : ''); switch($mode) { case 'network': @@ -63,7 +65,6 @@ class Conversation extends BaseObject { break; } $this->mode = $mode; - } /** @@ -80,6 +81,10 @@ class Conversation extends BaseObject { return $this->writable; } + public function is_commentable() { + return $this->commentable; + } + /** * Check if page is a preview */ @@ -101,6 +106,10 @@ class Conversation extends BaseObject { $this->set_mode($mode); } + public function get_observer() { + return $this->observer; + } + /** * Add a thread to the conversation @@ -121,12 +130,21 @@ class Conversation extends BaseObject { } /* - * Only add will be displayed + * Only add things that will be displayed */ - if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) { + + if(($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE))) { return false; } + + if(local_user() && $item->get_data_value('uid') == local_user()) + $this->commentable = true; + + if(($this->observer) && (! $this->writable)) { + $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$item['data']); + } + $item->set_conversation($this); $this->threads[] = $item; return end($this->threads); diff --git a/include/ItemObject.php b/include/ItemObject.php index e057936ae..a56f66a01 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -11,12 +11,10 @@ require_once('boot.php'); * An item */ class Item extends BaseObject { - private $data = array(); + public $data = array(); private $template = 'conv_item.tpl'; private $comment_box_template = 'comment_item.tpl'; private $toplevel = false; - private $writable = false; - private $commentable = false; private $children = array(); private $parent = null; private $conversation = null; @@ -34,19 +32,9 @@ class Item extends BaseObject { $a = $this->get_app(); $this->data = $data; - $this->channel = $a->get_channel(); - $this->observer = $a->get_observer(); - $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); - $this->writable = (((local_user()) && ($this->channel['channel_hash'] === $this->data['owner_xchan'])) ? true : false); - $this->commentable = $this->writable; - - if(($this->observer) && (! $this->writable)) { - $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$data); - } - // Prepare the children if(count($data['children'])) { foreach($data['children'] as $item) { @@ -106,10 +94,9 @@ class Item extends BaseObject { else $edpost = false; -// FIXME - this is wrong. -// if(($this->get_data_value('uid') == local_user()) || $this->is_visiting()) - - if($this->get_data_value('uid') == local_user()) + if($this->observer['xchan_hash'] == $this->get_data_value('author_xchan') + || $this->observer['xchan_hash'] == $this->get_data_value('owner_xchan') + || $this->get_data_value('uid') == local_user()) $dropping = true; if($dropping) { @@ -175,7 +162,7 @@ class Item extends BaseObject { ); } - if($this->is_commentable()) { + if($conv->is_commentable()) { $like = array( t("I like this \x28toggle\x29"), t("like")); $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike")); if ($shareable) @@ -455,28 +442,6 @@ class Item extends BaseObject { return $this->toplevel; } - /** - * Check if this is writable - */ - private function is_writable() { - - return $this->writable; - -// $conv = $this->get_conversation(); - -// return true; - -// if($conv) { - // This will allow us to comment on wall-to-wall items owned by our friends - // and community forums even if somebody else wrote the post. -// return ($this->writable || ($this->is_visiting() && $conv->get_mode() == 'channel')); -// } - } - - private function is_commentable() { - return $this->commentable; - } - /** * Count the total of our descendants */ @@ -514,44 +479,43 @@ class Item extends BaseObject { $comment_box = ''; $conv = $this->get_conversation(); - if(! $this->is_commentable()) + if(! $conv->is_commentable()) return; - if($conv->is_writable() || $this->is_writable()) { - $template = get_markup_template($this->get_comment_box_template()); + $template = get_markup_template($this->get_comment_box_template()); - $a = $this->get_app(); + $a = $this->get_app(); + $observer = $conv->get_observer(); - $qc = ((local_user()) ? get_pconfig(local_user(),'system','qcomment') : null); - $qcomment = (($qc) ? explode("\n",$qc) : null); + $qc = ((local_user()) ? get_pconfig(local_user(),'system','qcomment') : null); + $qcomment = (($qc) ? explode("\n",$qc) : null); - $comment_box = replace_macros($template,array( - '$return_path' => '', - '$threaded' => $this->is_threaded(), - '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), - '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'), - '$id' => $this->get_id(), - '$parent' => $this->get_id(), - '$qcomment' => $qcomment, - '$profile_uid' => $conv->get_profile_owner(), - '$mylink' => $this->observer['xchan_url'], - '$mytitle' => t('This is you'), - '$myphoto' => $this->observer['xchan_photo_s'], - '$comment' => t('Comment'), - '$submit' => t('Submit'), - '$edbold' => t('Bold'), - '$editalic' => t('Italic'), - '$eduline' => t('Underline'), - '$edquote' => t('Quote'), - '$edcode' => t('Code'), - '$edimg' => t('Image'), - '$edurl' => t('Link'), - '$edvideo' => t('Video'), - '$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), - '$indent' => $indent, - '$sourceapp' => get_app()->sourcename - )); - } + $comment_box = replace_macros($template,array( + '$return_path' => '', + '$threaded' => $this->is_threaded(), + '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), + '$type' => (($conv->get_mode() === 'channel') ? 'wall-comment' : 'net-comment'), + '$id' => $this->get_id(), + '$parent' => $this->get_id(), + '$qcomment' => $qcomment, + '$profile_uid' => $conv->get_profile_owner(), + '$mylink' => $observer['xchan_url'], + '$mytitle' => t('This is you'), + '$myphoto' => $observer['xchan_photo_s'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), + '$edbold' => t('Bold'), + '$editalic' => t('Italic'), + '$eduline' => t('Underline'), + '$edquote' => t('Quote'), + '$edcode' => t('Code'), + '$edimg' => t('Image'), + '$edurl' => t('Link'), + '$edvideo' => t('Video'), + '$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), + '$indent' => $indent, + '$sourceapp' => get_app()->sourcename + )); return $comment_box; } diff --git a/include/zot.php b/include/zot.php index f9b40c06f..6c8a21d1a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1354,7 +1354,7 @@ function import_directory_profile($hash,$profile) { } else { $update = true; - $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_keywords) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", + $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($arr['xprof_hash']), dbesc($arr['xprof_desc']), dbesc($arr['xprof_dob']), diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css index eeb822f72..277ea5596 100644 --- a/view/theme/redbasic/css/fancy.css +++ b/view/theme/redbasic/css/fancy.css @@ -1,7 +1,7 @@ /* There's probably some stuff in here we don't need, and maybe some missing stuff we do need. We can clean it up incrementaly, just get the heavy lifting done for now */ aside { -border-radius: 0px 0px 20px 0px;} +border-radius: $radiuspx;} .tab { @@ -9,9 +9,9 @@ border-radius: 0px 0px 20px 0px;} background-color: #f00; color: #fff !important; font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 20px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; margin: 0; width: auto; margin-left: 8px; @@ -38,7 +38,7 @@ border-radius: 0px 0px 20px 0px;} .wall-item-content-wrapper { position: relative; - border-radius: 10px; + border-radius: $radiuspx; box-shadow: 8px 8px 8px #000; border: 1px solid #eec; } @@ -68,7 +68,7 @@ opacity: 1; ul.menu-popup { background: #dd0000; color: #eec; - border-radius: 0px 0px 20px 20px; + border-radius: $radiuspx; z-index: 100000; -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c2de29548..f9423ac62 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -926,6 +926,9 @@ footer { .wall-item-content-wrapper { margin-top: 10px; position: relative; + border-radius: $radiuspx; + border: 1px solid #eec; + /* background: #fff; */ /* border-radius: 5px; */ /* box-shadow: 12px 12px 12px #111; */ diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index ec551923a..b90bfe169 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -54,6 +54,7 @@ // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';} if ($colour_scheme === 'redbasic'){$navcolour = 'red';} + $shadows = false; } // This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings. @@ -133,7 +134,8 @@ if ($displaystyle === "fancy") {if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) { $fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css')); - echo "$fancy";} + echo str_replace(array('$radius'),array($radius),$fancy); + } } // Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums From 69d9ec9a948be459886008f21b40f726cf74d8c4 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Jul 2013 22:27:55 -0700 Subject: [PATCH 13/15] This should fix some of the remote permissions issues --- include/ConversationObject.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/ConversationObject.php b/include/ConversationObject.php index e3b46ca3f..3f5e901d3 100644 --- a/include/ConversationObject.php +++ b/include/ConversationObject.php @@ -138,11 +138,14 @@ class Conversation extends BaseObject { return false; } - if(local_user() && $item->get_data_value('uid') == local_user()) + if(local_user() && $item->get_data_value('uid') == local_user()) + $this->commentable = true; + + if($this->writable) $this->commentable = true; if(($this->observer) && (! $this->writable)) { - $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$item['data']); + $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$item->data); } $item->set_conversation($this); From 5a8cda632b4ba78e19d49b0c652f43940a18ea9e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 9 Jul 2013 22:48:34 -0700 Subject: [PATCH 14/15] remove double tags on search results, updates to install doco to get rid of Friendica name there and clarify Red requirements. --- include/conversation.php | 12 ---- include/text.php | 31 ++++++----- install/INSTALL.txt | 91 +++++++++++-------------------- version.inc | 2 +- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 1 + 6 files changed, 54 insertions(+), 85 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 410143a7a..1023c068d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -584,17 +584,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tags=array(); $hashtags = array(); $mentions = array(); - foreach(explode(',',$item['tag']) as $tag){ - $tag = trim($tag); - if ($tag!="") { - $t = bbcode($tag); - $tags[] = $t; - if($t[0] == '#') - $hashtags[] = $t; - elseif($t[0] == '@') - $mentions[] = $t; - } - } $sp = false; $profile_link = best_link_url($item,$sp); @@ -650,7 +639,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', - 'tags' => $tags, 'id' => (($preview) ? 'P0' : $item['item_id']), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url), 'profile_url' => $profile_link, diff --git a/include/text.php b/include/text.php index db29697f9..2d29dff31 100755 --- a/include/text.php +++ b/include/text.php @@ -1023,19 +1023,24 @@ function prepare_body($item,$attach = false) { $s .= '
    '; } - if(is_array($item['term']) && count($item['term'])) { - $tstr = ''; - foreach($item['term'] as $t) { - $t1 = format_term_for_display($t); - if($t1) { - if($tstr) - $tstr .= ' '; - $tstr .= $t1; - } - } - if($tstr) - $s .= '
    ' . $tstr . '
    '; - } +// At some point in time, posttags were removed from the threaded conversation templates, but remained in the search_item template. +// Code to put them back was added into include/conversation.php and/or include/ItemObject.php but under new class names +// Then it was discovered that the following bits remained of the old code. +// Commented out, but we may decide to use this instead of the other version and put all the tag rendering in one place. In the other +// location it is more theme-able. +// if(is_array($item['term']) && count($item['term'])) { +// $tstr = ''; +// foreach($item['term'] as $t) { +// $t1 = format_term_for_display($t); +// if($t1) { +// if($tstr) +// $tstr .= ' '; +// $tstr .= $t1; +// } +// } +// if($tstr) +// $s .= '
    ' . $tstr . '
    '; +// } $writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false); diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 53e2018cc..3f135c349 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -1,31 +1,28 @@ -Friendica Installation +Red Matrix Installation -We've tried very hard to ensure that Friendica will run on commodity hosting -platforms - such as those used to host Wordpress blogs and Drupal websites. -But be aware that Friendica is more than a simple web application. It is a +We've tried very hard to ensure that the Red Matrix will run on commodity +hosting platforms - such as those used to host Wordpress blogs and Drupal +websites. It will run on most any Linux VPS system. Windows LAMP platforms +such as XAMPP and WAMP are not officially supported at this time - however +we welcome patches if you manage to get it working. + +Be aware that the Red Matrix is more than a simple web application. It is a complex communications system which more closely resembles an email server than a web server. For reliability and performance, messages are delivered in the background and are queued for later delivery when sites are down. This kind of functionality requires a bit more of the host system than the typical -blog. Not every PHP/MySQL hosting provider will be able to support Friendica. -Many will. But please review the requirements and confirm these with your -hosting provider prior to installation. +blog. Not every PHP/MySQL hosting provider will be able to support the +Red Matrix. Many will - but please review the requirements and confirm these +with your hosting provider prior to installation. (And preferably before +entering into a long-term contract.) Before you begin: Choose a domain name or subdomain name for your server. Put some thought into this - because changing it is currently not-supported. Things will break, and some of your friends may have difficulty communicating -with you. We plan to address this limitation in a future release. Also decide -if you wish to connect with members of the Diaspora network, as this will -impact the installation requirements. +with you. We plan to address this limitation in a future release. -Decide if you will use SSL and obtain an SSL cert. Communications with the -Diaspora network MAY require both SSL AND an SSL cert signed by a CA which is -recognised by the major browsers. Friendica will work with self-signed certs -but Diaspora communication may not. For best results, install your cert PRIOR -to installing Friendica and when visiting your site for the initial -installation in step 5, please use the https: link. (Use the http: or non-SSL -link if your cert is self-signed). +Decide if you will use SSL and obtain an SSL cert before software installation. You SHOULD use SSL. If you use SSL, you MUST use a "browser-valid" certificate. Please test your certificate prior to installation. A web tool for testing your certificate is available at "http://www.digicert.com/help/". When visiting your site for the first time, please use the SSL ("https://") URL if SSL is available. This will avoid problems later. 1. Requirements @@ -35,22 +32,21 @@ local .htaccess file - PHP 5.3+. The later the better. - PHP *command line* access with register_argc_argv set to true in the -php.ini file [or see 'poormancron' in section 8] +php.ini file - and with no hosting provider restrictions on the use of exec() +and proc_open(). - - curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions + - curl, gd (with at least jpeg support), mysqli, mbstring, mcrypt, and openssl extensions. The imagick extension is not required but desirable. - some form of email server or email gateway such that PHP mail() works - - Mysql 5.x + - Mysql 5.x or MariaDB - - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks -(Windows) [Note: other options are presented in Section 8 of this document] + - ability to schedule jobs with cron. - Installation into a top-level domain or sub-domain (without a -directory/path component in the URL) is preferred. This is REQUIRED if -you wish to communicate with the Diaspora network. +directory/path component in the URL) is REQUIRED. -2. Unpack the Friendica files into the root of your web server document area. +2. Unpack the Red Matrix files into the root of your web server document area. - If you copy the directory tree to your webserver, make sure that you also copy .htaccess - as "dot" files are often hidden @@ -66,8 +62,8 @@ write or create files in your web directory, create an empty file called 5. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing. If you are using -SSL with a known signature authority (recommended), use the https: link to your -website. If you are using a self-signed cert or no cert, use the http: link. +SSL with a known signature authority, use the https: link to your +website. 6. *If* the automated installation fails for any reason, check the following: @@ -112,24 +108,6 @@ look like (changing it to the correct PHP location) $a->config['system']['php_path'] = '/usr/local/php53/bin/php'; -Alternative: You may be able to use the 'poormancron' plugin to perform this -step if you are using a recent Friendica release. 'poormancron' may result in -perfomance and memory issues and is only suitable for small sites with one or -two users and a handful of contacts. To do this, edit the file -".htconfig.php" and look for a line describing your plugins. On a fresh -installation, it will look like - -$a->config['system']['addon'] = 'js_upload'; - -This indicates the "js_upload" addon module is enabled. You may add additional -addons/plugins using this same line in the configuration file. Change it to -read - -$a->config['system']['addon'] = 'js_upload,poormancron'; - -and save your changes. - - ##################################################################### @@ -153,8 +131,6 @@ the database server name is "localhost". This could be the result of one of our Apache directives not being supported by your version of Apache. Examine your apache server logs. - You might remove the line "Options -Indexes" from the .htaccess file if -you are using a Windows server as this has been known to cause problems. Also check your file permissions. Your website and all contents must generally be world-readable. @@ -200,8 +176,7 @@ likely that mod-rewrite is not installed in your web server or is not working. distribution or (if Windows) the provider of your Apache server software if you need to change either of these and can not figure out how. There is a lot of help available on the web. Google "mod-rewrite" along with the -name of your operating system distribution or Apache package (if using -Windows). +name of your operating system distribution or Apache package. ##################################################################### @@ -223,7 +198,7 @@ Retry the installation. As soon as the database has been created, ##################################################################### - Some configurations with "suhosin" security are configured without -an ability to run external processes. Friendica requires this ability. +an ability to run external processes. The Red Matrix requires this ability. Following are some notes provided by one of our members. ##################################################################### @@ -233,26 +208,26 @@ certain functions like proc_open, as configured in /etc/php5/conf.d/suhosin.ini: suhosin.executor.func.blacklist = proc_open, ... -For those sites like Friendica that really need these functions they can be -enabled, e.g. in /etc/apache2/sites-available/friendica: +For those sites like Red Matrix that really need these functions they can be +enabled, e.g. in /etc/apache2/sites-available/redmatrix: - + php_admin_value suhosin.executor.func.blacklist none php_admin_value suhosin.executor.eval.blacklist none -This enables every function for Friendica if accessed via browser, but not for +This enables every function for Red Matrix if accessed via browser, but not for the cronjob that is called via php command line. I attempted to enable it for cron by using something like - */10 * * * * cd /var/www/friendica/friendica/ && sudo -u www-data /usr/bin/php + */10 * * * * cd /var/www/redmatrix/ && sudo -u www-data /usr/bin/php -d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none -f include/poller.php -This worked well for simple test cases, but the friendica-cron still failed with +This worked well for simple test cases, but the cron job still failed with a fatal error: suhosin[22962]: ALERT - function within blacklist called: proc_open() (attacker -'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php', line 1341) +'REMOTE_ADDR not set', file '/var/www/redmatrix/boot.php', line 1341) After a while I noticed, that include/poller.php calls further php script via proc_open. These scripts themselves also use proc_open and fail, because they @@ -264,7 +239,7 @@ So the simple solution is to put the correct parameters into .htconfig.php: -d suhosin.executor.eval.blacklist=none'; -This is obvious as soon as you notice that the friendica-cron uses proc_open to +This is obvious as soon as you notice that the cron uses proc_open to execute php-scripts that also use proc_open, but it took me quite some time to find that out. I hope this saves some time for other people using suhosin with function blacklists. diff --git a/version.inc b/version.inc index cc94e5645..09f027043 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-07-08.368 +2013-07-09.369 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f9423ac62..762c35a18 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2827,7 +2827,7 @@ aside input[type='text'] { filter:alpha(opacity=100) !important; } -.posttags { +.posttags, .body-tag { margin-top: 15px; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index b90bfe169..aa88443bc 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -55,6 +55,7 @@ if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';} if ($colour_scheme === 'redbasic'){$navcolour = 'red';} $shadows = false; + $radius = 5; } // This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings. From 72d737cc82f5987791c9ceba0c8b99a505886274 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 10 Jul 2013 05:14:23 -0700 Subject: [PATCH 15/15] fix missing edit link --- include/ItemObject.php | 9 ++++----- version.inc | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index a56f66a01..7a9e43819 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -25,7 +25,6 @@ class Item extends BaseObject { private $wall_to_wall = false; private $threaded = false; private $visiting = false; - private $observer = null; private $channel = null; public function __construct($data) { @@ -68,7 +67,6 @@ class Item extends BaseObject { $result = array(); $a = $this->get_app(); - $observer = $this->observer; $item = $this->get_data(); $commentww = ''; @@ -82,6 +80,7 @@ class Item extends BaseObject { $total_children = $this->count_descendants(); $conv = $this->get_conversation(); + $observer = $conv->get_observer(); $lock = ((($item['item_private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) @@ -94,8 +93,8 @@ class Item extends BaseObject { else $edpost = false; - if($this->observer['xchan_hash'] == $this->get_data_value('author_xchan') - || $this->observer['xchan_hash'] == $this->get_data_value('owner_xchan') + if($observer['xchan_hash'] == $this->get_data_value('author_xchan') + || $observer['xchan_hash'] == $this->get_data_value('owner_xchan') || $this->get_data_value('uid') == local_user()) $dropping = true; @@ -105,7 +104,7 @@ class Item extends BaseObject { 'delete' => t('Delete'), ); } - +// FIXME if($observer_is_pageowner) { $multidrop = array( 'select' => t('Select'), diff --git a/version.inc b/version.inc index 09f027043..11af6685f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-07-09.369 +2013-07-10.370