From b6bb3c02525843caeaee3f6409f1b97b160ea8a2 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 19:47:00 +0100 Subject: [PATCH 01/24] fix a typo --- view/css/conversation.css | 2 +- view/theme/redbasic/css/style.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 5bf6a3607..5abc9c66a 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -110,7 +110,7 @@ /* conversation */ -.thread-wrapper .toplevel_item { +.thread-wrapper.toplevel_item { width: 92%; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9ac021a54..68ddcf7a2 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2265,7 +2265,7 @@ img.mail-list-sender-photo { border-left: 2px solid #eee; } -.thread-wrapper .toplevel_item { +.thread-wrapper.toplevel_item { max-width: $converse_width; } From 6e28c40c2732daa40d4e54ad3231af5798964fa2 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 20:22:22 +0100 Subject: [PATCH 02/24] we make this with css now --- view/theme/redbasic/js/redbasic.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e89c51119..e41fde2b8 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -47,16 +47,6 @@ $('.savedsearchdrop').hover( $(this).css('opacity','0');} ); -$('.savedsearchterm').hover( - function() { - id = $(this).attr('id'); - $('#dropicon-' + id).css('opacity','1.0');}, - - function() { - id = $(this).attr('id'); - $('#dropicon-' + id).css('opacity','0'); - }); - }); @@ -72,4 +62,4 @@ $(document).ready(function(){ } }; setInterval(function () {checkNotify();}, 10 * 1000); -}); \ No newline at end of file +}); From 176fe3256428c8a2226030c4e1de89723e37cca7 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 18 Dec 2013 21:13:48 +0100 Subject: [PATCH 03/24] show drop-icon on wall-item hover only --- view/css/conversation.css | 8 ++++++++ view/theme/redbasic/css/style.css | 8 ++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 5abc9c66a..8125b6278 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -125,6 +125,14 @@ position: relative; } +.wall-item-content-wrapper .wall-item-delete-wrapper { + opacity: 0; +} + +.wall-item-content-wrapper:hover .wall-item-delete-wrapper { + opacity: 1; +} + .wall-item-info { display: block; float: left; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 68ddcf7a2..411356d80 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2087,12 +2087,12 @@ margin-right: 50px; } a .drop-icons { - color: #777; + color: $toolicon_colour;; font-size: 1.2em; text-decoration: none; } -.drop-icons:hover { +a .drop-icons:hover { color: #FF0000; } @@ -2364,10 +2364,6 @@ img.mail-list-sender-photo { color: $toolicon_activecolour; } -.drop-icons.item-tool { - color: $toolicon_colour; -} - .like-rotator { color: $toolicon_colour; } From 1a4c91ccf5f95d03badd57f655d4feced50d39d2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Dec 2013 14:53:18 -0800 Subject: [PATCH 04/24] Add App::poi to store the "person of interest" for a given page. This is so we can comanchificate the vcard_from_xchan widget -- it will pick up the target xchan from the page environment. --- boot.php | 11 ++++++----- mod/chanview.php | 17 ++++++++--------- mod/connedit.php | 28 ++++++++++++++-------------- mod/message.php | 7 +++---- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/boot.php b/boot.php index 9c0fb8919..f85049bc2 100755 --- a/boot.php +++ b/boot.php @@ -572,11 +572,12 @@ function startup() { class App { - public $account = null; // account record - public $channel = null; // channel record - public $observer = null; // xchan record - public $profile_uid = 0; // If applicable, the uid of the person whose stuff this is. - public $layout = array(); // Comanche parsed template + public $account = null; // account record of the logged-in account + public $channel = null; // channel record of the current channel of the logged-in account + public $observer = null; // xchan record of the page observer + public $profile_uid = 0; // If applicable, the channel_id of the "page owner" + public $poi = null; // "person of interest", generally a referenced connection + public $layout = array(); // Comanche parsed template private $perms = null; // observer permissions diff --git a/mod/chanview.php b/mod/chanview.php index f183fbdf1..c87b85d26 100644 --- a/mod/chanview.php +++ b/mod/chanview.php @@ -38,17 +38,16 @@ function chanview_content(&$a) { ); } if($r) { - $xchan = $r[0]; + $a->poi = $r[0]; } - // Here, let's see if we have an xchan. If we don't, how we proceed is determined by what // info we do have. If it's a URL, we can offer to visit it directly. If it's a webbie or // address, we can and should try to import it. If it's just a hash, we can't continue, but we // probably wouldn't have a hash if we don't already have an xchan for this channel. - if(! $xchan) { + if(! $a->poi) { logger('mod_chanview: fallback'); // This is hackish - construct a zot address from the url if($_REQUEST['url']) { @@ -68,20 +67,20 @@ function chanview_content(&$a) { dbesc($_REQUEST['address']) ); if($r) - $xchan = $r[0]; + $a->poi = $r[0]; } } } - if(! $xchan) { + if(! $a->poi) { notice( t('Channel not found.') . EOL); return; } $url = (($observer) - ? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] - : $xchan['xchan_url'] + ? z_root() . '/magic?f=&dest=' . $a->poi['xchan_url'] . '&addr=' . $a->poi['xchan_addr'] + : $a->poi['xchan_url'] ); // let somebody over-ride the iframed viewport presentation @@ -90,8 +89,8 @@ function chanview_content(&$a) { goaway($url); - if($xchan['xchan_hash']) - $a->set_widget('vcard',vcard_from_xchan($xchan,$observer,'chanview')); + if($a->poi['xchan_hash']) + $a->set_widget('vcard',vcard_from_xchan($a->poi,$observer,'chanview')); $o = replace_macros(get_markup_template('chanview.tpl'),array( '$url' => $url, diff --git a/mod/connedit.php b/mod/connedit.php index 7fc4bfaf8..6d34ad997 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -21,7 +21,7 @@ function connedit_init(&$a) { intval(argv(1)) ); if($r) { - $a->data['abook'] = $r[0]; + $a->poi = $r[0]; } } @@ -37,9 +37,9 @@ function connedit_aside(&$a) { if (! local_user()) return; - if(x($a->data,'abook')) { - $a->set_widget('vcard',vcard_from_xchan($a->data['abook'],$a->get_observer())); - $a->set_widget('collections', group_side('connections','group',false,0,$a->data['abook']['abook_xchan'])); + if($a->poi) { + $a->set_widget('vcard',vcard_from_xchan($a->poi,$a->get_observer())); + $a->set_widget('collections', group_side('connections','group',false,0,$a->poi['abook_xchan'])); } $a->set_widget('suggest',widget_suggestions(array())); @@ -123,8 +123,8 @@ function connedit_post(&$a) { else notice( t('Failed to update connection record.') . EOL); - if((x($a->data,'abook')) && $a->data['abook']['abook_my_perms'] != $abook_my_perms - && (! ($a->data['abook']['abook_flags'] & ABOOK_FLAG_SELF))) { + if($a->poi && $a->poi['abook_my_perms'] != $abook_my_perms + && (! ($a->poi['abook_flags'] & ABOOK_FLAG_SELF))) { proc_run('php', 'include/notifier.php', 'permission_update', $contact_id); } @@ -135,7 +135,7 @@ function connedit_post(&$a) { require_once('include/group.php'); $g = group_rec_byhash(local_user(),$default_group); if($g) - group_add_member(local_user(),'',$a->data['abook_xchan'],$g['id']); + group_add_member(local_user(),'',$a->poi['abook_xchan'],$g['id']); } @@ -159,11 +159,11 @@ function connedit_post(&$a) { intval($contact_id) ); if($r) { - $a->data['abook'] = $r[0]; + $a->poi = $r[0]; } if($new_friend) { - $arr = array('channel_id' => local_user(), 'abook' => $a->data['abook']); + $arr = array('channel_id' => local_user(), 'abook' => $a->poi); call_hooks('accept_follow', $arr); } @@ -175,9 +175,9 @@ function connedit_post(&$a) { function connedit_clone(&$a) { - if(! array_key_exists('abook',$a->data)) + if(! $a->poi) return; - $clone = $a->data['abook']; + $clone = $a->poi; unset($clone['abook_id']); unset($clone['abook_account']); @@ -315,10 +315,10 @@ function connedit_content(&$a) { } } - if((x($a->data,'abook')) && (is_array($a->data['abook']))) { + if($a->poi) { - $contact_id = $a->data['abook']['abook_id']; - $contact = $a->data['abook']; + $contact_id = $a->poi['abook_id']; + $contact = $a->poi; $tabs = array( diff --git a/mod/message.php b/mod/message.php index 6a33f1db7..8bb9a6ee7 100644 --- a/mod/message.php +++ b/mod/message.php @@ -374,15 +374,14 @@ function message_content(&$a) { return $o; } - $other_channel = null; if($messages[0]['to_xchan'] === $channel['channel_hash']) - $other_channel = $messages[0]['from']; + $a->poi = $messages[0]['from']; else - $other_channel = $messages[0]['to']; + $a->poi = $messages[0]['to']; require_once('include/Contact.php'); - $a->set_widget('mail_conversant',vcard_from_xchan($other_channel,$get_observer_hash,'mail')); + $a->set_widget('mail_conversant',vcard_from_xchan($a->poi,$get_observer_hash,'mail')); $tpl = get_markup_template('msg-header.tpl'); From 22973357985bfa3a4803fe5c3e53d99117e615b1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Dec 2013 15:53:40 -0800 Subject: [PATCH 05/24] remove the .wgl (widget list) file processing for ordering widgets on a page. This preceded Comanche and was never used and is now obsolete. --- boot.php | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/boot.php b/boot.php index f85049bc2..1fc65d78f 100755 --- a/boot.php +++ b/boot.php @@ -904,44 +904,8 @@ class App { return $this->groups; } - /* - * Use a theme or app specific widget ordering list to determine what widgets should be included - * for each module and in what order and optionally what region of the page to place them. - * For example: - * view/wgl/mod_connections.wgl: - * ----------------------------- - * vcard aside - * follow aside - * findpeople rightside - * collections aside - * - * If your widgetlist does not include a widget that is destined for the page, it will not be rendered. - * You can also use this to change the order of presentation, as they will be presented in the order you specify. - * - */ - function set_widget($title,$html, $location = 'aside') { - $widgetlist_file = 'mod_' . $this->module . '.wgl'; - if(! $this->widgetlist) { - if($this->module && (($f = theme_include($widgetlist_file)) !== '')) { - $s = file($f, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES); - if(is_array($s)) { - foreach($s as $x) { - $this->widgetlist[] = explode(' ', $x); - } - } - } - else { - $this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location); - } - } - if($this->widgetlist) { - foreach($this->widgetlist as $k => $v) { - if($v[0] && $v[0] === $title) { - $this->widgets[$k] = array('title' => $title, 'html' => $html, 'location' => (($v[1]) ?$v[1] : $location)); - } - } - } + $this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location); } function get_widgets($location = '') { From 2089a1379a57ba5c27e220e664cb76ffb0acc1dd Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Dec 2013 18:29:53 -0800 Subject: [PATCH 06/24] provide git revision in siteinfo if possible and if not instructed otherwise --- mod/siteinfo.php | 20 ++++++++++++++++---- view/tpl/siteinfo.tpl | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/mod/siteinfo.php b/mod/siteinfo.php index a64b5df20..9f65f59e4 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -27,8 +27,14 @@ function siteinfo_init(&$a) { $visible_plugins[] = $rr['name']; } + if(@is_dir('.git') && function_exists('shell_exec')) + $commit = @shell_exec('git log -1 --format="%h"'); + if(! isset($commit) || strlen($commit) > 16) + $commit = ''; + $data = Array( 'version' => RED_VERSION, + 'commit' => $commit, 'url' => z_root(), 'plugins' => $visible_plugins, 'register_policy' => $register_policy[$a->config['system']['register_policy']], @@ -47,11 +53,16 @@ function siteinfo_init(&$a) { function siteinfo_content(&$a) { - if(! get_config('system','hidden_version_siteinfo')) + if(! get_config('system','hidden_version_siteinfo')) { $version = sprintf( t('Version %s'), RED_VERSION ); - else - $version = ""; - + if(@is_dir('.git') && function_exists('shell_exec')) + $commit = @shell_exec('git log -1 --format="%h"'); + if(! isset($commit) || strlen($commit) > 16) + $commit = ''; + } + else { + $version = $commit = ''; + } $visible_plugins = array(); if(is_array($a->plugins) && count($a->plugins)) { $r = q("select * from addon where hidden = 0"); @@ -81,6 +92,7 @@ function siteinfo_content(&$a) { '$title' => t('Red'), '$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'), '$version' => $version, + '$commit' => $commit, '$web_location' => t('Running at web location') . ' ' . z_root(), '$visit' => t('Please visit GetZot.com to learn more about the Red Matrix.'), '$bug_text' => t('Bug reports and issues: please visit'), diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index f6647110c..a60b406cf 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -2,7 +2,7 @@

{{$description}}

{{if $version}} -

{{$version}}

+

{{$version}}{{if $commit}}+{{$commit}}{{/if}}

{{/if}}

{{$web_location}}

{{$visit}}

From 125543adedfe00b3d5cea8548d1a66096a173a6b Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 02:16:14 -0800 Subject: [PATCH 07/24] more comanche migration --- include/text.php | 21 +++--- include/widgets.php | 16 +++++ mod/blocks.php | 6 +- mod/layouts.php | 6 +- mod/menu.php | 2 +- mod/settings.php | 108 +----------------------------- mod/webpages.php | 6 +- version.inc | 2 +- view/pdl/mod_blocks.pdl | 3 + view/pdl/mod_layouts.pdl | 3 + view/pdl/mod_menu.pdl | 3 + view/pdl/mod_webpages.pdl | 3 + view/theme/redbasic/css/style.css | 4 ++ view/tpl/design_tools.tpl | 2 + 14 files changed, 58 insertions(+), 127 deletions(-) create mode 100644 view/pdl/mod_blocks.pdl create mode 100644 view/pdl/mod_layouts.pdl create mode 100644 view/pdl/mod_menu.pdl create mode 100644 view/pdl/mod_webpages.pdl diff --git a/include/text.php b/include/text.php index f808fb0a0..b3154d23e 100755 --- a/include/text.php +++ b/include/text.php @@ -1889,18 +1889,17 @@ function json_decode_plus($s) { function design_tools() { -$channel = get_app()->get_channel(); -$who = $channel['channel_address']; - -return replace_macros(get_markup_template('design_tools.tpl'), array( - '$title' => t('Design'), - '$who' => $who, - '$blocks' => t('Blocks'), - '$menus' => t('Menus'), - '$layout' => t('Layouts'), - '$pages' => t('Pages') - )); + $channel = get_app()->get_channel(); + $who = $channel['channel_address']; + return replace_macros(get_markup_template('design_tools.tpl'), array( + '$title' => t('Design'), + '$who' => $who, + '$blocks' => t('Blocks'), + '$menus' => t('Menus'), + '$layout' => t('Layouts'), + '$pages' => t('Pages') + )); } /* case insensitive in_array() */ diff --git a/include/widgets.php b/include/widgets.php index 9d6617aa2..ed155be9b 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -494,4 +494,20 @@ function widget_mailmenu($arr) { )); +} + +function widget_design_tools($arr) { + $a = get_app(); + + // mod menu doesn't load a profile. For any modules which load a profile, check it. + // otherwise local_user() is sufficient for permissions. + + if($a->profile['profile_uid']) + if($a->profile['profile_uid'] != local_user()) + return ''; + + if(! local_user()) + return ''; + + return design_tools(); } \ No newline at end of file diff --git a/mod/blocks.php b/mod/blocks.php index 4604790c3..9a4e0b1ca 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -45,9 +45,9 @@ function blocks_content(&$a) { return; } - if(local_user() && local_user() == $owner) { - $a->set_widget('design',design_tools()); - } +// if(local_user() && local_user() == $owner) { + // $a->set_widget('design',design_tools()); + // } diff --git a/mod/layouts.php b/mod/layouts.php index b1f53d4d8..9ed349850 100644 --- a/mod/layouts.php +++ b/mod/layouts.php @@ -43,9 +43,9 @@ function layouts_content(&$a) { return; } - if(local_user() && local_user() == $owner) { - $a->set_widget('design',design_tools()); - } +// if(local_user() && local_user() == $owner) { + // $a->set_widget('design',design_tools()); + // } $tabs = array( array( diff --git a/mod/menu.php b/mod/menu.php index 1ec3c7996..47eed6484 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -42,7 +42,7 @@ function menu_content(&$a) { } - $a->set_widget('design',design_tools()); +// $a->set_widget('design',design_tools()); if(argc() == 1) { diff --git a/mod/settings.php b/mod/settings.php index 7fb6f8317..5aa018cc2 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -16,14 +16,10 @@ function get_theme_config_file($theme){ } function settings_init(&$a) { + if(! local_user()) + return; + $a->profile_uid = local_user(); -} - - -function settings_aside(&$a) { - -if (! local_user()) - return; // default is channel settings in the absence of other arguments @@ -32,107 +28,9 @@ if (! local_user()) $a->argc = 2; $a->argv[] = 'channel'; } -/* - $channel = $a->get_channel(); - - $abook_self_id = 0; - - // Retrieve the 'self' address book entry for use in the auto-permissions link - if(local_user()) { - $abk = q("select abook_id from abook where abook_channel = %d and ( abook_flags & %d ) limit 1", - intval(local_user()), - intval(ABOOK_FLAG_SELF) - ); - if($abk) - $abook_self_id = $abk[0]['abook_id']; - } - $tabs = array( - array( - 'label' => t('Account settings'), - 'url' => $a->get_baseurl(true).'/settings/account', - 'selected' => ((argv(1) === 'account') ? 'active' : ''), - ), - - array( - 'label' => t('Channel settings'), - 'url' => $a->get_baseurl(true).'/settings/channel', - 'selected' => ((argv(1) === 'channel') ? 'active' : ''), - ), - - array( - 'label' => t('Additional features'), - 'url' => $a->get_baseurl(true).'/settings/features', - 'selected' => ((argv(1) === 'features') ? 'active' : ''), - ), - array( - 'label' => t('Feature settings'), - 'url' => $a->get_baseurl(true).'/settings/featured', - 'selected' => ((argv(1) === 'featured') ? 'active' : ''), - ), - - array( - 'label' => t('Display settings'), - 'url' => $a->get_baseurl(true).'/settings/display', - 'selected' => ((argv(1) === 'display') ? 'active' : ''), - ), - - array( - 'label' => t('Connected apps'), - 'url' => $a->get_baseurl(true) . '/settings/oauth', - 'selected' => ((argv(1) === 'oauth') ? 'active' : ''), - ), - - array( - 'label' => t('Export channel'), - 'url' => $a->get_baseurl(true) . '/uexport/basic', - 'selected' => '' - ), - -// array( -// 'label' => t('Export account'), -// 'url' => $a->get_baseurl(true) . '/uexport/complete', -// 'selected' => '' -// ), - - array( - 'label' => t('Automatic Permissions (Advanced)'), - 'url' => $a->get_baseurl(true) . '/connedit/' . $abook_self_id, - 'selected' => '' - ), - - - ); - - if(feature_enabled(local_user(),'premium_channel')) { - $tabs[] = array( - 'label' => t('Premium Channel Settings'), - 'url' => $a->get_baseurl(true) . '/connect/' . $channel['channel_address'], - 'selected' => '' - ); - - } - - if(feature_enabled(local_user(),'channel_sources')) { - $tabs[] = array( - 'label' => t('Channel Sources'), - 'url' => $a->get_baseurl(true) . '/sources', - 'selected' => '' - ); - - } - - - - $tabtpl = get_markup_template("generic_links_widget.tpl"); - $a->page['aside'] = replace_macros($tabtpl, array( - '$title' => t('Settings'), - '$class' => 'settings-widget', - '$items' => $tabs, - )); -*/ } diff --git a/mod/webpages.php b/mod/webpages.php index 90004faa1..7e1b32f36 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -41,9 +41,9 @@ function webpages_content(&$a) { return; } - if(local_user() && local_user() == $owner) { - $a->set_widget('design',design_tools()); - } +// if(local_user() && local_user() == $owner) { +// $a->set_widget('design',design_tools()); +// } $mimetype = get_config('system','page_mimetype'); diff --git a/version.inc b/version.inc index 50e01fa2c..8ba637b20 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-17.530 +2013-12-19.531 diff --git a/view/pdl/mod_blocks.pdl b/view/pdl/mod_blocks.pdl new file mode 100644 index 000000000..cef69f194 --- /dev/null +++ b/view/pdl/mod_blocks.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=design_tools][/widget] +[/region] \ No newline at end of file diff --git a/view/pdl/mod_layouts.pdl b/view/pdl/mod_layouts.pdl new file mode 100644 index 000000000..cef69f194 --- /dev/null +++ b/view/pdl/mod_layouts.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=design_tools][/widget] +[/region] \ No newline at end of file diff --git a/view/pdl/mod_menu.pdl b/view/pdl/mod_menu.pdl new file mode 100644 index 000000000..cef69f194 --- /dev/null +++ b/view/pdl/mod_menu.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=design_tools][/widget] +[/region] \ No newline at end of file diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl new file mode 100644 index 000000000..cef69f194 --- /dev/null +++ b/view/pdl/mod_webpages.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=design_tools][/widget] +[/region] \ No newline at end of file diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 411356d80..5f532a861 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2122,6 +2122,10 @@ a .drop-icons:hover { margin-right: 10px; } +.design-tools ul { + list-style-type: none; +} + .design-icons { margin-right: 10px; } diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl index eb082dc37..80a538231 100644 --- a/view/tpl/design_tools.tpl +++ b/view/tpl/design_tools.tpl @@ -1,7 +1,9 @@ From b28a37c38e3fc68b1d0a59e4f5e6054ce13cb680 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 02:25:44 -0800 Subject: [PATCH 08/24] more comanche --- include/widgets.php | 4 ++++ mod/suggest.php | 7 ------- view/pdl/mod_suggest.pdl | 4 ++++ 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 view/pdl/mod_suggest.pdl diff --git a/include/widgets.php b/include/widgets.php index ed155be9b..5418d6d8e 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -510,4 +510,8 @@ function widget_design_tools($arr) { return ''; return design_tools(); +} + +function widget_findpeople($arr) { + return findpeople_widget(); } \ No newline at end of file diff --git a/mod/suggest.php b/mod/suggest.php index baccbd38f..8a6b50b22 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -19,13 +19,6 @@ function suggest_init(&$a) { } -function suggest_aside(&$a) { - - $a->set_widget('follow', widget_follow(array())); - $a->set_widget('findpeople', findpeople_widget()); -} - - function suggest_content(&$a) { $o = ''; diff --git a/view/pdl/mod_suggest.pdl b/view/pdl/mod_suggest.pdl new file mode 100644 index 000000000..c2889f2fe --- /dev/null +++ b/view/pdl/mod_suggest.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=follow][/widget] +[widget=findpeople][/widget] +[/region] \ No newline at end of file From 825492407e3e064b6cd806b3ed7d484d2cc9f50e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 02:35:45 -0800 Subject: [PATCH 09/24] more comanche --- include/Contact.php | 6 +++++- mod/connections.php | 17 ----------------- view/pdl/mod_connections.pdl | 5 +++++ 3 files changed, 10 insertions(+), 18 deletions(-) create mode 100644 view/pdl/mod_connections.pdl diff --git a/include/Contact.php b/include/Contact.php index 20dd04d17..59605e463 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -78,12 +78,16 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { $a = get_app(); if(! $xchan) { - if($a->profile['channel_hash']) + if($a->poi) { + $xchan = $a->poi; + } + elseif($a->profile['channel_hash']) { $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($a->profile['channel_hash']) ); if($r) $xchan = $r[0]; + } } if(! $xchan) diff --git a/mod/connections.php b/mod/connections.php index 10f0468b6..0365a0585 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -19,23 +19,6 @@ function connections_init(&$a) { } -function connections_aside(&$a) { - - - if (! local_user()) - return; - - - $a->set_widget('follow', widget_follow(array())); - - - $a->set_widget('suggest',widget_suggestions(array())); - $a->set_widget('findpeople',findpeople_widget()); - -} - - - function connections_post(&$a) { if(! local_user()) diff --git a/view/pdl/mod_connections.pdl b/view/pdl/mod_connections.pdl new file mode 100644 index 000000000..fc86e4490 --- /dev/null +++ b/view/pdl/mod_connections.pdl @@ -0,0 +1,5 @@ +[region=aside] +[widget=follow][/widget] +[widget=suggestions][/widget] +[widget=findpeople][/widget] +[/region] From e6dc916915af631effc790f1cadf740666168049 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 13:52:23 -0800 Subject: [PATCH 10/24] if somebody tagged you in a private post, the tag email notification contained the obscured message. Clear it. --- include/enotify.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 011a1cde2..1ab6e7dfb 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -183,9 +183,6 @@ function notification($params) { $recip['channel_name'], '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', $params['link']); - - // FIXME - check the item privacy - $private = false; $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -455,6 +452,8 @@ function notification($params) { if(! $datarray['email_secure']) { switch($params['type']) { case NOTIFY_WALL: + case NOTIFY_TAGSELF: + case NOTIFY_POKE: case NOTIFY_COMMENT: if(! $private) break; From f8042cc4677227aca8999c875c4f6d4c7acef96c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 15:23:36 -0800 Subject: [PATCH 11/24] add 'src' parameter to api photo list --- include/photos.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/photos.php b/include/photos.php index 9828140b8..3ccb536a8 100644 --- a/include/photos.php +++ b/include/photos.php @@ -324,8 +324,11 @@ function photos_list_photos($channel,$observer,$album = '') { intval(PHOTO_NORMAL), intval(PHOTO_PROFILE) ); - + if($r) { + for($x = 0; $x < count($r); $x ++) { + $r[$x]['src'] = z_root() . '/photo/' . $r[$x]['resource_id'] . '-' . $r[$x]['scale']; + } $ret['success'] = true; $ret['photos'] = $r; } From 7c81889b3397f09dfba4f17bba99f6d1dad9d0b2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 16:33:36 -0800 Subject: [PATCH 12/24] make default profile photo configurable - should be functional but needs admin ui --- images/default_profile_photos/blank/175.jpg | Bin 0 -> 910 bytes images/default_profile_photos/blank/48.jpg | Bin 0 -> 566 bytes images/default_profile_photos/blank/80.jpg | Bin 0 -> 614 bytes .../default_profile_photos/red_koala/175.jpg | Bin 0 -> 22969 bytes .../default_profile_photos/red_koala/48.jpg | Bin 0 -> 4856 bytes .../default_profile_photos/red_koala/80.jpg | Bin 0 -> 9105 bytes include/identity.php | 21 ++++++ include/network.php | 2 +- include/photo/photo_driver.php | 6 +- mod/photo.php | 12 ++-- mod/qsearch.php | 50 --------------- mod/redir.php | 60 ------------------ 12 files changed, 31 insertions(+), 120 deletions(-) create mode 100644 images/default_profile_photos/blank/175.jpg create mode 100644 images/default_profile_photos/blank/48.jpg create mode 100644 images/default_profile_photos/blank/80.jpg create mode 100644 images/default_profile_photos/red_koala/175.jpg create mode 100644 images/default_profile_photos/red_koala/48.jpg create mode 100644 images/default_profile_photos/red_koala/80.jpg delete mode 100644 mod/qsearch.php delete mode 100644 mod/redir.php diff --git a/images/default_profile_photos/blank/175.jpg b/images/default_profile_photos/blank/175.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4024d6e885af225bb9b5be3fd7a767047daf8e4e GIT binary patch literal 910 zcmdUr&q@O^5XNVcO*h?S*GZey9xM1BD-oJnv{*SZfMn%Bn|YYAV~oDc(T5 literal 0 HcmV?d00001 diff --git a/images/default_profile_photos/blank/48.jpg b/images/default_profile_photos/blank/48.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e7c44fcffb49249c50e7195375efcd21fd7f60e5 GIT binary patch literal 566 zcmb7_g+*3LjgIOT`*ih6prI9o2x$Jdw3i}7K5JWtP~U#?(U}D|J2Erer{X86|mtv1CMWc|4xMf literal 0 HcmV?d00001 diff --git a/images/default_profile_photos/blank/80.jpg b/images/default_profile_photos/blank/80.jpg new file mode 100644 index 0000000000000000000000000000000000000000..767e1ee668856c30cddc3ec88ca3220ae8758968 GIT binary patch literal 614 zcmb7<&q@O^5XNVcO*h?S*GZey9xM1BD-o_i<{-*cJg??yqlcId6Pb23Q~x+xiW60 zmC7&aL{{Y;DSnU7+ literal 0 HcmV?d00001 diff --git a/images/default_profile_photos/red_koala/175.jpg b/images/default_profile_photos/red_koala/175.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e49343b1dad44d769fee3a0bd57ff1a039c91e7a GIT binary patch literal 22969 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

v zcSB_v;!uxdv=xkQeqctD`e${rjqsLLukDzu4bAR}_l05jB`Uvq>%O{ug3uoy`3F20 zs0eZWyH1#8%3+ zyKvH0wNMpslFjSEBcr(73|h#j?qj28GS9_Ec&xPZUD1lZB|SM6<&`mLZy6X5?Z9TS z{(hc$)4#j|#_1%S)GFFCNsx__x@~F98ilN=d*==3(JWgf!fd!Go~>s(#hOsdGDhtN zzuq%c<5s#q$Y2TiLaiw$PB>qR`2f?P&I~>@VE4_p%s+G>OGGgZ3e&G=GS)9yC(DCB zrli63tLR@y??cJ7esRqkr8ll`A5hOi2dAaa_pGkJ3h6sHvSibP3@gS!Wi zO%aJ=SK#M0u{TX4F2nTi2!iOIXmP6r2W*d6R;P=B%fEb!x7WJ6#|G!R3p3fodF;jq zS7d_~@~M^?2aA0B=osG!xT{du=gek9X|nCl=zbAtzy0b{1kYtKO%=^~E!{YBrWwrw zo`=sNgCKnPD`{lmB@9TP$d|_5kO;hgL6&(fUV(QO(Zt>OcIAr}d!_>?hnD6#Q-~S- z-L*%(uiVtGG(E|RrGI&6a0HwOWS8(=wqi)pVx={bDsfjAIMr1+xJYm>jry}p zfGN~wr<+qWr|urE^Ib($gYXM^_#8%!e0&ohPS)Q(Ora#HL%Kz`fuA-6WhfxA)F{IY z_h~5Y-2FssiZC!Hd-4r{8K>`yn#M`nEN@sIFugtZE=BgNX>7C*5qRGe!sO-qP==~I zM)s{cL9Dq+7^r8TZFJY9YLW18QL@KZVf?*&lRo-v>fcZ2T(FHZyR76-e4ICXi}uHX p%f9H#O)ynSF4C~`NDY0<0;{K-OZ^y~OXK#Pu9m^x>BI5pe*mQCKzRTF literal 0 HcmV?d00001 diff --git a/images/default_profile_photos/red_koala/80.jpg b/images/default_profile_photos/red_koala/80.jpg new file mode 100644 index 0000000000000000000000000000000000000000..efab04c268305cb1cb4be3b1d9d5d0d69393448c GIT binary patch literal 9105 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 literal 0 HcmV?d00001 diff --git a/include/identity.php b/include/identity.php index 6bbf193c1..4d38b2828 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1109,3 +1109,24 @@ function get_theme_uid() { } return $uid; } + +/** + * @function get_default_profile_photo($size = 175) + * Retrieves the path of the default_profile_photo for this system + * with the specified size. + * @param int $size + * one of (175, 80, 48) + * @returns string + * + */ + +function get_default_profile_photo($size = 175) { + $scheme = get_config('system','default_profile_photo'); + if(! $scheme) + $scheme = 'rainbow_man'; + return 'images/default_profile_photos/' . $scheme . '/' . $size . 'jpg'; +} + + + + \ No newline at end of file diff --git a/include/network.php b/include/network.php index 7446c2384..3fe7f5400 100644 --- a/include/network.php +++ b/include/network.php @@ -548,7 +548,7 @@ function avatar_img($email) { call_hooks('avatar_lookup', $avatar); if(! $avatar['success']) - $avatar['url'] = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg'; + $avatar['url'] = $a->get_baseurl() . '/' . get_default_profile_photo(); logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG); return $avatar['url']; diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 8730b4298..3d8ee2196 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -576,9 +576,9 @@ function import_profile_photo($photo,$xchan) { $photo_failure = true; } if($photo_failure) { - $photo = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg'; - $thumb = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/80.jpg'; - $micro = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/48.jpg'; + $photo = $a->get_baseurl() . '/' . get_default_profile_photo(); + $thumb = $a->get_baseurl() . '/' . get_default_profile_photo(80); + $micro = $a->get_baseurl() . '/' . get_default_profile_photo(48); $type = 'image/jpeg'; } diff --git a/mod/photo.php b/mod/photo.php index 591d7198a..6f047bea1 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -24,7 +24,7 @@ function photo_init(&$a) { $observer_xchan = get_observer_hash(); - $default = 'images/default_profile_photos/rainbow_man/175.jpg'; + $default = get_default_profile_photo(); if(isset($type)) { @@ -38,11 +38,11 @@ function photo_init(&$a) { case 'm': $resolution = 5; - $default = 'images/default_profile_photos/rainbow_man/80.jpg'; + $default = get_default_profile_photo(80); break; case 's': $resolution = 6; - $default = 'images/default_profile_photos/rainbow_man/48.jpg'; + $default = get_default_profile_photo(48); break; case 'l': default: @@ -135,15 +135,15 @@ function photo_init(&$a) { switch($resolution) { case 4: - $data = file_get_contents('images/default_profile_photos/rainbow_man/175.jpg'); + $data = file_get_contents(get_default_profile_photo()); $mimetype = 'image/jpeg'; break; case 5: - $data = file_get_contents('images/default_profile_photos/rainbow_man/80.jpg'); + $data = file_get_contents(get_default_profile_photo(80)); $mimetype = 'image/jpeg'; break; case 6: - $data = file_get_contents('images/default_profile_photos/rainbow_man/48.jpg'); + $data = file_get_contents(get_default_profile_photo(48)); $mimetype = 'image/jpeg'; break; default: diff --git a/mod/qsearch.php b/mod/qsearch.php deleted file mode 100644 index c35e253b6..000000000 --- a/mod/qsearch.php +++ /dev/null @@ -1,50 +0,0 @@ -argc > 1 && intval($a->argv[1])) { - - $cid = $a->argv[1]; - - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($cid), - intval(local_user()) - ); - - if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN)) - goaway(z_root()); - - $dfrn_id = $orig_id = (($r[0]['issued_id']) ? $r[0]['issued_id'] : $r[0]['dfrn_id']); - - if($r[0]['duplex'] && $r[0]['issued_id']) { - $orig_id = $r[0]['issued_id']; - $dfrn_id = '1:' . $orig_id; - } - if($r[0]['duplex'] && $r[0]['dfrn_id']) { - $orig_id = $r[0]['dfrn_id']; - $dfrn_id = '0:' . $orig_id; - } - - $sec = random_string(); - - q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`) - VALUES( %d, %s, '%s', '%s', %d )", - intval(local_user()), - intval($cid), - dbesc($dfrn_id), - dbesc($sec), - intval(time() + 45) - ); - - logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); - $dest = (($url) ? '&destination_url=' . $url : ''); - goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest ); - } - - if(local_user()) - $handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3); - if(remote_user()) - $handle = $_SESSION['handle']; - - if($url) { - $url = str_replace('{zid}','&zid=' . $handle,$url); - goaway($url); - } - - goaway(z_root()); -} From 564f431551672d706136559a4fed3a3c4f98c0ec Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 17:36:31 -0800 Subject: [PATCH 13/24] comanchificate mod_photos --- doc/To-Do-Code.md | 2 +- include/widgets.php | 33 +++++++++++++++++++-------------- mod/photos.php | 17 +++++------------ view/pdl/mod_photos.pdl | 4 ++++ 4 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 view/pdl/mod_photos.pdl diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index df8a476b9..dc2ba8245 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -43,7 +43,7 @@ We need much more than this, but here are areas where developers can help. Pleas * Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away). -* Re-working of widgets so that entire application and page contents (e.g. modules) will be available to and under the control of themes/apps using Comanche layouts. +* (In Progress) Re-working of widgets so that entire application and page contents (e.g. modules) will be available to and under the control of themes/apps using Comanche layouts. In many cases some of the work has already been started and code exists so that you needn't start from scratch. Please contact one of the developer channels like Channel One (one@zothub.com) before embarking and we can tell you what we already have and provide some insights on how we envision these features fitting together. diff --git a/include/widgets.php b/include/widgets.php index 5418d6d8e..5bb937c2e 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1,18 +1,5 @@ t('Displays a full channel profile'), - 'tagcloud' => t('Tag cloud of webpage categories'), - 'collections' => t('List and filter by collection'), - 'suggestions' => t('Show a couple of channel suggestion'), - 'follow' => t('Provide a channel follow form') - ); - $arr = array('widgets' => $widgets); - call_hooks('list_widgets',$arr); - return $arr['widgets']; -} - function widget_profile($args) { $a = get_app(); @@ -514,4 +501,22 @@ function widget_design_tools($arr) { function widget_findpeople($arr) { return findpeople_widget(); -} \ No newline at end of file +} + + +function widget_photo_albums($arr) { + $a = get_app(); + if(! $a->profile['profile_uid']) + return ''; + $channelx = channelx_by_n($a->profile['profile_uid']); + if((! $channelx) || (! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'view_photos'))) + return ''; + return photos_album_widget($channelx[0],$a->get_observer()); + +} + + +function widget_vcard($arr) { + return vcard_from_xchan('',get_app()->get_observer()); +} + diff --git a/mod/photos.php b/mod/photos.php index 0e23aa5bf..63806896b 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -34,16 +34,7 @@ function photos_init(&$a) { $observer_xchan = (($observer) ? $observer['xchan_hash'] : ''); - $a->data['perms'] = get_all_perms($channelx[0]['channel_id'],$observer_xchan); - - - - $a->set_widget('vcard',vcard_from_xchan('',$observer)); head_set_icon($a->data['channel']['xchan_photo_s']); - if($a->data['perms']['view_photos']) { - $a->data['albums'] = photos_albums_list($a->data['channel'],$observer); - $a->set_widget('photo_albums',photos_album_widget($a->data['channel'],$observer,$a->data['albums'])); - } $a->page['htmlhead'] .= "" ; @@ -599,6 +590,8 @@ function photos_content(&$a) { // Parse arguments // + $can_comment = perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'post_comments'); + if(argc() > 3) { $datatype = argv(2); $datum = argv(3); @@ -1066,7 +1059,7 @@ function photos_content(&$a) { $likebuttons = ''; - if($can_post || $a->data['perms']['post_comments']) { + if($can_post || $can_comment) { $likebuttons = replace_macros($like_tpl,array( '$id' => $link_item['id'], '$likethis' => t("I like this \x28toggle\x29"), @@ -1078,7 +1071,7 @@ function photos_content(&$a) { $comments = ''; if(! count($r)) { - if($can_post || $a->data['perms']['post_comments']) { + if($can_post || $can_comment) { $comments .= replace_macros($cmnt_tpl,array( '$return_path' => '', '$mode' => 'photos', @@ -1166,7 +1159,7 @@ function photos_content(&$a) { } - if($can_post || $a->data['perms']['post_comments']) { + if($can_post || $can_comment) { $comments .= replace_macros($cmnt_tpl,array( '$return_path' => '', '$jsreload' => $return_url, diff --git a/view/pdl/mod_photos.pdl b/view/pdl/mod_photos.pdl new file mode 100644 index 000000000..c37cf02fe --- /dev/null +++ b/view/pdl/mod_photos.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=vcard][/widget] +[widget=photo_albums][/widget] +[/region] From 6c2ea59cde5ddce4f26fedccb99c2ea2a40ff451 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 17:44:30 -0800 Subject: [PATCH 14/24] give doc/help alternate mimetype support --- mod/help.php | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/mod/help.php b/mod/help.php index e78f9e61c..cd2dfd87e 100644 --- a/mod/help.php +++ b/mod/help.php @@ -32,6 +32,8 @@ function help_content(&$a) { global $lang; + $doctype = 'markdown'; + require_once('library/markdown.php'); $text = ''; @@ -40,6 +42,19 @@ function help_content(&$a) { $text = load_doc_file('doc/' . $a->argv[1] . '.md'); $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); } + if(! $text) { + $text = load_doc_file('doc/' . $a->argv[1] . '.bb'); + if($text) + $doctype = 'bbcode'; + $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + } + if(! $text) { + $text = load_doc_file('doc/' . $a->argv[1] . '.html'); + if($text) + $doctype = 'html'; + $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + } + if(! $text) { $text = load_doc_file('doc/Site.md'); $a->page['title'] = t('Help'); @@ -58,9 +73,15 @@ function help_content(&$a) { } $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); - - - return Markdown($text); + + if($doctype === 'html') + return $text; + if($doctype === 'markdown') + return Markdown($text); + if($doctype === 'bbcode') { + require_once('include/bbcode.php'); + return bbcode($text); + } } From 648a7a5735148479fc8d97bfaa1f3d3cca249276 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 18:33:02 -0800 Subject: [PATCH 15/24] add bbcode reference --- doc/Home.md | 1 + doc/bbcode.html | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 doc/bbcode.html diff --git a/doc/Home.md b/doc/Home.md index 4a37e6c82..a57225b96 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -13,6 +13,7 @@ Red Matrix Documentation and Resources * [Tags and Mentions](help/Tags-and-Mentions) * [Web Pages](help/Webpages) * [Remove Account](help/Remove-Account) +* [BBcode reference for posts and comments](help/bbcode) **Technical Documentation** diff --git a/doc/bbcode.html b/doc/bbcode.html new file mode 100644 index 000000000..6f7e21bcc --- /dev/null +++ b/doc/bbcode.html @@ -0,0 +1,68 @@ +

BBcode reference

+
+

+
    +
  • [b]bold[/b] - bold
    +
  • [i]italic[/i] - italic
    +
  • [u]underlined[/u] - underlined
    +
  • [s]strike[/s] - strike
    +
  • [color= red]red[/color] - red
    +
  • [url=https://www.redmatrix.me]Red Matrix[/url] Red Matrix
    +
  • [img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [code]code[/code] code
    +
  • [quote]quote[/quote]
    quote

    +
  • [quote=Author]Author? Me? No, no, no...[/quote]
    Author wrote:
    Author? Me? No, no, no...

    +
  • [nobb] may be used to escape bbcode.

+ +
You can make lists with:
+
    +
  • [list]
    +
  • [list=1]
    +
  • [list=i]
    +
  • [list=I]
    +
  • [list=a]
    +
  • [list=A]
    +
  • [ul]
    +
  • [ol] + +
For example:
[ul]
[*] First list element
[*] Second list element
[/ul]

Will render something like:
+
    +
  • First list element
    +
  • Second list element

+
There's also:
+
    +
  • [hr]
    +
  • [video]video URL[/video]
    +
  • [audio]audio URL[/audio]
    +
  • [table]
    +
  • [th]
    +
  • [td]
    +
  • [tr]
    +
  • [center]
    +
  • [font=courier]some text[/font] some text
    +

+
Tables? Yes!

[table border=1]
[tr]
[th]Tables now[/th]
[/tr]
[tr]
[td]Have headers[/td]
[/tr]
[/table]

Tables now
Have headers

All sizes,
From the [size=xx-small] - xx-small.
To the [size=xx-large] - xx-large.
To fit exactly 20px use [size=20].

+ +

Red Matrix specific codes

+
    +
  • [&copy;] © This works for many HTML entities
    +
  • [zrl]https://redmatrix.me[/zrl] Magic-auth version of [url] tag
    +
  • [zmg]https://redmatrix.me/some/photo.jpg[/zmg] Magic-auth version of [img] tag
    +
    +
  • [observer=1]Text to display if observer is authenticated in the matrix[/observer] +
  • [observer=0]Text to display if observer is not authenticated in the matrix[/observer]
    +
  • [observer.baseurl] website of observer
    +
  • [observer.url] channel URL of observer
    +
  • [observer.name] name of observer
    +
  • [observer.address] address (zot-id) of observer
    +
  • [observer.photo] profile photo of observer
    +
    + +
  • [rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional
    + + + +
+ + + From bccc20f38c3919d453b0dee1ed354aa4eb13b398 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 19:16:46 -0800 Subject: [PATCH 16/24] default photo issue, and connections page showing deleted accounts. Also show last updated on connedit page --- doc/bbcode.html | 2 +- include/identity.php | 2 +- mod/connections.php | 8 +++++--- mod/connedit.php | 2 +- view/tpl/abook_edit.tpl | 4 ++++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/bbcode.html b/doc/bbcode.html index 6f7e21bcc..7183f50c1 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -6,7 +6,7 @@
  • [i]italic[/i] - italic
  • [u]underlined[/u] - underlined
  • [s]strike[/s] - strike
    -
  • [color= red]red[/color] - red
    +
  • [color=red]red[/color] - red
  • [url=https://www.redmatrix.me]Red Matrix[/url] Red Matrix
  • [img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
  • [code]code[/code] code
    diff --git a/include/identity.php b/include/identity.php index 4d38b2828..80f02a9c5 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1124,7 +1124,7 @@ function get_default_profile_photo($size = 175) { $scheme = get_config('system','default_profile_photo'); if(! $scheme) $scheme = 'rainbow_man'; - return 'images/default_profile_photos/' . $scheme . '/' . $size . 'jpg'; + return 'images/default_profile_photos/' . $scheme . '/' . $size . '.jpg'; } diff --git a/mod/connections.php b/mod/connections.php index 0365a0585..2119c69c7 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -300,9 +300,10 @@ function connections_content(&$a) { $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash - where abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ", + where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d ) $sql_extra $sql_extra2 ", intval(local_user()), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED) ); if(count($r)) { $a->set_pager_total($r[0]['total']); @@ -310,9 +311,10 @@ function connections_content(&$a) { } $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash - WHERE abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", + WHERE abook_channel = %d and not (abook_flags & %d) and not ( xchan_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", intval(local_user()), intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED), intval($a->pager['start']), intval($a->pager['itemspage']) ); diff --git a/mod/connedit.php b/mod/connedit.php index 6d34ad997..c6c8845c8 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -482,7 +482,7 @@ function connedit_content(&$a) { '$lastupdtext' => t('Last update:'), '$lost_contact' => $lost_contact, '$updpub' => t('Update public posts'), - '$last_update' => $last_update, + '$last_update' => relative_date($contact['abook_connected']), '$udnow' => t('Update now'), '$profile_select' => contact_profile_assign($contact['abook_profile']), '$multiprofs' => feature_enabled(local_user(),'multi_profiles'), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 23368f2f7..590213fd3 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -16,6 +16,10 @@
    +{{if $last_update}} +{{$lastupdtext}} {{$last_update}} +{{/if}} + {{if $notself}} {{if $slide}}

    {{$lbl_slider}}

    From cd78f9d13df721ea218cc8ba023470899b64a151 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 20:23:19 -0800 Subject: [PATCH 17/24] sourced items which are then edited at the source weren't setting up the second delivery chain. --- include/items.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index b328ca2d1..26fdc3c5c 100755 --- a/include/items.php +++ b/include/items.php @@ -2148,6 +2148,13 @@ function tag_deliver($uid,$item_id) { $item = $i[0]; + if(($item['source_xchan']) && ($item['item_flags'] & ITEM_UPLINK) && ($item['item_flags'] & ITEM_THREAD_TOP) && ($item['edited'] != $item['created'])) { + // this is an update to a post which was already processed by us and has a second delivery chain + // Just start the second delivery chain to deliver the updated post + proc_run('php','include/notifier.php','tgroup',$item['id']); + return; + } + if($item['obj_type'] === ACTIVITY_OBJ_TAGTERM) { @@ -2444,7 +2451,7 @@ function check_item_source($uid,$item) { $r = q("select * from source where src_channel_id = %d and src_xchan = '%s' limit 1", intval($uid), - dbesc($item['owner_xchan']) + dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) ); if(! $r) From 2c0fbc508e44ebc96b00e4e8a5e166324fbcf9b3 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Dec 2013 23:56:37 -0800 Subject: [PATCH 18/24] comanchify connedit, group --- include/group.php | 2 +- include/widgets.php | 35 ++++++++++++++++++++++++++++++++--- mod/connedit.php | 18 ------------------ mod/group.php | 6 ------ view/pdl/mod_connedit.pdl | 6 ++++++ view/pdl/mod_group.pdl | 3 +++ 6 files changed, 42 insertions(+), 28 deletions(-) create mode 100644 view/pdl/mod_connedit.pdl create mode 100644 view/pdl/mod_group.pdl diff --git a/include/group.php b/include/group.php index 8f690785d..c19c83c80 100644 --- a/include/group.php +++ b/include/group.php @@ -229,7 +229,7 @@ function mini_group_select($uid,$group = '') { -function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = '',$mode = 1) { +function group_side($every="connections",$each="group",$edit = false, $group_id = 0, $cid = '',$mode = 1) { $o = ''; diff --git a/include/widgets.php b/include/widgets.php index 5bb937c2e..2591a9d09 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -34,10 +34,39 @@ function widget_tagcloud($args) { function widget_collections($args) { require_once('include/group.php'); - $page = argv(0); - $gid = $_REQUEST['gid']; - return group_side($page,$page,true,$_REQUEST['gid'],'',0); + $mode = ((array_key_exists('mode',$args)) ? $args['mode'] : 'conversation'); + switch($mode) { + case 'conversation': + $every = argv(0); + $each = argv(0); + $edit = true; + $current = $_REQUEST['gid']; + $abook_id = 0; + $wmode = 0; + break; + case 'groups': + $every = 'connections'; + $each = argv(0); + $edit = false; + $current = intval(argv(1)); + $abook_id = 0; + $wmode = 1; + break; + case 'abook': + $every = 'connections'; + $each = 'group'; + $edit = false; + $current = 0; + $abook_id = get_app()->poi['abook_xchan']; + $wmode = 1; + break; + default: + return ''; + break; + } + + return group_side($every, $each, $edit, $current, $abook_id, $wmode); } diff --git a/mod/connedit.php b/mod/connedit.php index c6c8845c8..e2d4b861c 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -31,24 +31,6 @@ function connedit_init(&$a) { } -function connedit_aside(&$a) { - - - if (! local_user()) - return; - - if($a->poi) { - $a->set_widget('vcard',vcard_from_xchan($a->poi,$a->get_observer())); - $a->set_widget('collections', group_side('connections','group',false,0,$a->poi['abook_xchan'])); - } - - $a->set_widget('suggest',widget_suggestions(array())); - $a->set_widget('findpeople',findpeople_widget()); - -} - - - function connedit_post(&$a) { if(! local_user()) diff --git a/mod/group.php b/mod/group.php index 5a34ab6fb..352484e25 100644 --- a/mod/group.php +++ b/mod/group.php @@ -2,12 +2,6 @@ require_once('include/group.php'); -function group_aside(&$a) { - if(local_user()) { - $a->set_widget('groups_edit',group_side('connections','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0))); - } -} - function group_post(&$a) { diff --git a/view/pdl/mod_connedit.pdl b/view/pdl/mod_connedit.pdl new file mode 100644 index 000000000..4b468e34c --- /dev/null +++ b/view/pdl/mod_connedit.pdl @@ -0,0 +1,6 @@ +[region=aside] +[widget=vcard][/widget] +[widget=collections][var=mode]abook[/var][/widget] +[widget=suggestions][/widget] +[widget=findpeople][/widget] +[/region] diff --git a/view/pdl/mod_group.pdl b/view/pdl/mod_group.pdl new file mode 100644 index 000000000..8db29cf78 --- /dev/null +++ b/view/pdl/mod_group.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=collections][var=mode]groups[/var][/widget] +[/region] From 916f3e9afc0dcf7f4255bac917ed6236595c7e07 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 20 Dec 2013 01:39:05 -0800 Subject: [PATCH 19/24] doc updates --- doc/html/Contact_8php.html | 8 +- doc/html/bbcode_8php.html | 2 +- doc/html/boot_8php.html | 112 +++++--- doc/html/boot_8php.js | 3 + doc/html/classApp-members.html | 101 +++---- doc/html/classApp.html | 14 + doc/html/classApp.js | 1 + doc/html/connections_8php.html | 20 +- doc/html/connections_8php.js | 1 - doc/html/connedit_8php.html | 193 ++++++++++++++ doc/html/connedit_8php.js | 7 + doc/html/contact__selectors_8php.html | 4 +- doc/html/contact__widgets_8php.html | 2 +- doc/html/conversation_8php.html | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- .../dir_817f6d302394b98e59575acdb59998bc.html | 4 - .../dir_817f6d302394b98e59575acdb59998bc.js | 2 - .../dir_d41ce877eb409a4791b288730010abe2.html | 8 +- .../dir_d41ce877eb409a4791b288730010abe2.js | 6 +- doc/html/extract_8php.html | 4 +- doc/html/features_8php.html | 2 +- doc/html/files.html | 122 ++++----- doc/html/full_8php.html | 4 +- doc/html/functions.html | 3 + doc/html/functions_vars.html | 3 + doc/html/globals_0x61.html | 6 +- doc/html/globals_0x63.html | 15 +- doc/html/globals_0x67.html | 8 +- doc/html/globals_0x68.html | 6 + doc/html/globals_0x6c.html | 3 - doc/html/globals_0x6d.html | 3 - doc/html/globals_0x70.html | 5 +- doc/html/globals_0x71.html | 3 - doc/html/globals_0x72.html | 3 - doc/html/globals_0x73.html | 6 - doc/html/globals_0x77.html | 18 ++ doc/html/globals_0x78.html | 3 + doc/html/globals_func_0x61.html | 3 - doc/html/globals_func_0x63.html | 15 +- doc/html/globals_func_0x67.html | 8 +- doc/html/globals_func_0x68.html | 6 + doc/html/globals_func_0x6c.html | 3 - doc/html/globals_func_0x6d.html | 3 - doc/html/globals_func_0x71.html | 3 - doc/html/globals_func_0x72.html | 3 - doc/html/globals_func_0x73.html | 6 - doc/html/globals_func_0x77.html | 18 ++ doc/html/globals_vars_0x61.html | 3 + doc/html/globals_vars_0x70.html | 5 +- doc/html/globals_vars_0x78.html | 3 + doc/html/home_8php.html | 43 +++ doc/html/home_8php.js | 5 + doc/html/identity_8php.html | 30 ++- doc/html/identity_8php.js | 1 + doc/html/include_2config_8php.html | 6 +- doc/html/include_2group_8php.html | 16 +- doc/html/include_2group_8php.js | 2 +- doc/html/include_2photos_8php.html | 4 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/mod_2group_8php.html | 18 -- doc/html/mod_2group_8php.js | 1 - doc/html/mod_2message_8php.html | 18 -- doc/html/mod_2message_8php.js | 1 - doc/html/navtree.js | 12 +- doc/html/navtreeindex0.js | 252 +++++++++--------- doc/html/navtreeindex1.js | 234 ++++++++-------- doc/html/navtreeindex2.js | 50 ++-- doc/html/navtreeindex3.js | 16 +- doc/html/navtreeindex4.js | 50 ++-- doc/html/navtreeindex5.js | 52 ++-- doc/html/navtreeindex6.js | 156 +++++------ doc/html/navtreeindex7.js | 134 +++++----- doc/html/permissions_8php.html | 6 +- doc/html/php2po_8php.html | 2 +- doc/html/php_2default_8php.html | 4 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/plugin_8php.html | 6 +- doc/html/search/all_24.js | 1 + doc/html/search/all_61.js | 5 +- doc/html/search/all_63.js | 8 +- doc/html/search/all_67.js | 6 +- doc/html/search/all_68.js | 2 + doc/html/search/all_6c.js | 1 - doc/html/search/all_6d.js | 3 - doc/html/search/all_70.js | 3 +- doc/html/search/all_71.js | 2 - doc/html/search/all_72.js | 2 - doc/html/search/all_73.js | 2 - doc/html/search/all_77.js | 6 + doc/html/search/all_78.js | 1 + doc/html/search/files_61.js | 5 +- doc/html/search/files_63.js | 1 + doc/html/search/files_6d.js | 2 - doc/html/search/files_71.js | 1 - doc/html/search/files_72.js | 1 - doc/html/search/functions_61.js | 1 - doc/html/search/functions_63.js | 5 +- doc/html/search/functions_67.js | 4 +- doc/html/search/functions_68.js | 2 + doc/html/search/functions_6c.js | 1 - doc/html/search/functions_6d.js | 1 - doc/html/search/functions_71.js | 1 - doc/html/search/functions_72.js | 1 - doc/html/search/functions_73.js | 2 - doc/html/search/functions_77.js | 6 + doc/html/search/variables_24.js | 1 + doc/html/search/variables_61.js | 1 + doc/html/search/variables_70.js | 3 +- doc/html/search/variables_78.js | 3 +- doc/html/settings_8php.html | 18 -- doc/html/settings_8php.js | 1 - doc/html/socgraph_8php.html | 2 - doc/html/suggest_8php.html | 18 -- doc/html/suggest_8php.js | 1 - doc/html/text_8php.html | 14 +- doc/html/typo_8php.html | 2 +- doc/html/widgets_8php.html | 129 +++++++-- doc/html/widgets_8php.js | 9 +- doc/html/zfinger_8php.html | 2 + doc/html/zot_8php.html | 4 +- 122 files changed, 1290 insertions(+), 911 deletions(-) create mode 100644 doc/html/connedit_8php.html create mode 100644 doc/html/connedit_8php.js create mode 100644 doc/html/home_8php.js diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index ead25e6a2..e5f75da07 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -213,7 +213,7 @@ Functions
    -

    Referenced by connections_content().

    +

    Referenced by connedit_content().

    @@ -303,6 +303,8 @@ Functions
    +

    Referenced by widget_photo_albums().

    +
    @@ -347,7 +349,7 @@ Functions
    -

    Referenced by connections_content(), and post_post().

    +

    Referenced by connedit_content(), and post_post().

    @@ -502,7 +504,7 @@ Functions diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html index 455cfac95..2086751e7 100644 --- a/doc/html/bbcode_8php.html +++ b/doc/html/bbcode_8php.html @@ -241,7 +241,7 @@ Functions diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 99630baf6..3085b9914 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -292,6 +292,8 @@ Variables   const PAGE_ADULT 0x0020   +const PAGE_SYSTEM 0x1000 +  const PAGE_REMOVED 0x8000   const PHOTO_NORMAL 0x0000 @@ -456,6 +458,8 @@ Variables   const XCHAN_FLAGS_SELFCENSORED 0x0008   +const XCHAN_FLAGS_SYSTEM 0x0010 +  const XCHAN_FLAGS_DELETED 0x1000   const HUBLOC_NOTUSED 0x0000 @@ -596,10 +600,12 @@ Variables   const ACCOUNT_PENDING 0x0010   -const ACCOUNT_ROLE_ADMIN 0x1000 -  const ACCOUNT_ROLE_ALLOWCODE 0x0001   +const ACCOUNT_ROLE_SYSTEM 0x0002 +  +const ACCOUNT_ROLE_ADMIN 0x1000 +  const ITEM_VISIBLE 0x0000   const ITEM_HIDDEN 0x0001 @@ -698,7 +704,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(), blocks_content(), channel_init(), common_init(), connect_init(), connections_content(), connections_init(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), help_content(), layouts_content(), like_content(), lockview_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), 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(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), rpost_content(), settings_aside(), settings_post(), setup_init(), share_init(), sources_content(), 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(), webpages_content(), and zotfeed_init().

    +

    Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), attach_init(), blocks_content(), channel_init(), common_init(), connect_init(), connections_content(), connedit_content(), connedit_init(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), help_content(), layouts_content(), like_content(), lockview_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), 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(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), rpost_content(), settings_init(), settings_post(), setup_init(), share_init(), sources_content(), 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(), webpages_content(), and zotfeed_init().

    @@ -716,7 +722,7 @@ Variables
    -

    Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), allfriends_content(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), attach_init(), blocks_content(), channel_init(), common_init(), connect_init(), connections_content(), connections_init(), connections_post(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), help_content(), layouts_content(), like_content(), lockview_content(), manage_content(), menu_content(), menu_post(), message_aside(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), page_init(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), rpost_content(), settings_aside(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), widget_collections(), and zotfeed_init().

    +

    Referenced by App\__construct(), _well_known_init(), admin_content(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), attach_init(), blocks_content(), channel_init(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), help_content(), layouts_content(), like_content(), lockview_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), page_init(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), queue_run(), register_init(), regmod_content(), rpost_content(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), widget_collections(), widget_mailmenu(), widget_settings_menu(), and zotfeed_init().

    @@ -919,7 +925,7 @@ Variables @@ -936,7 +942,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blogtheme_imgurl(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_block(), comanche_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), drop_item(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), syncdirs(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_archive(), widget_categories(), widget_filer(), widget_follow(), widget_fullprofile(), widget_profile(), widget_savedsearch(), widget_tagcloud(), widget_tagcloud_wall(), z_fetch_url(), and zot_finger().

    +

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blogtheme_imgurl(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_block(), comanche_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), drop_item(), event_store(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), photos_album_widget(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), syncdirs(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_archive(), widget_categories(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

    @@ -998,7 +1004,7 @@ Variables
    -

    Referenced by advanced_profile(), attach_by_hash(), attach_by_hash_nodata(), attach_mkdir(), attach_store(), comanche_menu(), common_content(), common_friends_visitor_widget(), dir_safe_mode(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_post(), get_public_feed(), item_permissions_sql(), magic_init(), mitem_content(), new_contact(), notice(), permissions_sql(), photo_init(), photos_post(), prepare_body(), profile_content(), profile_sidebar(), search_content(), stream_perms_xchans(), suggest_content(), tagger_content(), thing_init(), toggle_safesearch_init(), viewconnections_content(), vote_content(), vote_post(), wall_attach_post(), widget_suggestions(), and z_readdir().

    +

    Referenced by advanced_profile(), attach_by_hash(), attach_by_hash_nodata(), attach_mkdir(), attach_store(), comanche_menu(), common_content(), common_friends_visitor_widget(), dir_safe_mode(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_post(), get_public_feed(), item_permissions_sql(), magic_init(), mitem_content(), new_contact(), notice(), permissions_sql(), photo_init(), photos_content(), photos_post(), prepare_body(), profile_content(), profile_sidebar(), search_content(), stream_perms_xchans(), suggest_content(), tagger_content(), thing_init(), toggle_safesearch_init(), viewconnections_content(), vote_content(), vote_post(), wall_attach_post(), widget_photo_albums(), widget_suggestions(), and z_readdir().

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

    Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_content(), connections_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), follow_init(), group_content(), group_post(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sources_content(), sources_post(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), and zid_init().

    +

    Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sources_content(), sources_post(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), and zid_init().

    @@ -1049,7 +1055,7 @@ Variables @@ -1067,7 +1073,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(), directory_content(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), network_content(), oexchange_content(), post_init(), profile_photo_post(), profiles_init(), profiles_post(), register_post(), regmod_content(), settings_post(), sources_content(), sources_post(), suggest_content(), tagrm_post(), thing_init(), 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_post(), connedit_content(), connedit_post(), directory_content(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), network_content(), oexchange_content(), post_init(), profile_photo_post(), profiles_init(), profiles_post(), register_post(), regmod_content(), settings_post(), sources_content(), sources_post(), suggest_content(), tagrm_post(), thing_init(), user_allow(), and viewconnections_content().

    @@ -1118,7 +1124,7 @@ Variables
    -

    Referenced by FriendicaSmartyEngine\__construct(), acl_init(), admin_content(), api_content(), api_ff_ids(), api_friendica_version(), api_oauth_access_token(), api_oauth_request_token(), api_statusnet_version(), attach_init(), check_form_security_token_ForbiddenOnErr(), cloud_init(), contactgroup_content(), events_content(), fbrowser_content(), feed_init(), filer_content(), filerm_content(), goaway(), http_status_exit(), item_post(), json_return_and_die(), like_content(), lockview_content(), msearch_post(), network_content(), oembed_init(), oexchange_init(), opensearch_init(), parse_url_content(), photo_init(), photos_post(), php_init(), ping_init(), poco_init(), poller_run(), pretheme_init(), qsearch_init(), App\register_template_engine(), regmod_content(), search_ac_init(), setup_init(), setup_post(), share_init(), siteinfo_init(), sitelist_init(), starred_init(), subthread_content(), system_unavailable(), tagger_content(), App\template_engine(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xml_status(), and xrd_init().

    +

    Referenced by FriendicaSmartyEngine\__construct(), acl_init(), admin_content(), api_content(), api_ff_ids(), api_friendica_version(), api_oauth_access_token(), api_oauth_request_token(), api_statusnet_version(), attach_init(), check_form_security_token_ForbiddenOnErr(), cloud_init(), contactgroup_content(), events_content(), fbrowser_content(), feed_init(), filer_content(), filerm_content(), goaway(), http_status_exit(), item_post(), json_return_and_die(), like_content(), lockview_content(), msearch_post(), network_content(), oembed_init(), oexchange_init(), opensearch_init(), parse_url_content(), photo_init(), photos_post(), php_init(), ping_init(), poco_init(), poller_run(), pretheme_init(), App\register_template_engine(), regmod_content(), search_ac_init(), setup_init(), setup_post(), share_init(), siteinfo_init(), sitelist_init(), starred_init(), subthread_content(), system_unavailable(), tagger_content(), App\template_engine(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), wfinger_init(), xml_status(), and xrd_init().

    @@ -1153,7 +1159,7 @@ Variables
    -

    Referenced by Conversation\__construct(), acl_init(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connect_content(), connect_post(), connections_aside(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), current_theme(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), get_theme_uid(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_aside(), message_content(), message_post(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_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_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), search_init(), search_saved_searches(), searchbox(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), 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_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_filer(), widget_follow(), widget_fullprofile(), widget_notes(), widget_profile(), widget_savedsearch(), widget_suggestions(), z_input_filter(), zid_init(), and zping_content().

    +

    Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), apw_form(), best_link_url(), blocks_content(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contact_select(), contactgroup_content(), conversation(), current_theme(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), home_init(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), message_post(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_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_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), redbasic_form(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), search_init(), search_saved_searches(), searchbox(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), 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_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_notes(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), z_input_filter(), zid_init(), and zping_content().

    @@ -1187,7 +1193,7 @@ Variables @@ -1205,7 +1211,7 @@ Variables
    -

    Referenced by admin_content(), admin_page_hubloc(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), blocks_content(), channel_content(), channel_init(), chanview_content(), check_form_security_token_redirectOnErr(), common_content(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_post(), delegate_content(), directory_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), import_content(), import_post(), invite_content(), invite_post(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), 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(), rmagic_post(), search_content(), settings_post(), sources_content(), suggest_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    +

    Referenced by admin_content(), admin_page_hubloc(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), apps_content(), attach_init(), blocks_content(), channel_content(), channel_init(), chanview_content(), check_form_security_token_redirectOnErr(), common_content(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), home_content(), import_content(), import_post(), invite_content(), invite_post(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), 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(), rmagic_post(), search_content(), settings_post(), sources_content(), sources_post(), suggest_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -1227,7 +1233,7 @@ Variables

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

    $cmd and string args are surrounded with ""

    -

    Referenced by build_sync_packet(), channel_remove(), connect_post(), connections_content(), connections_post(), create_identity(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_expire(), item_post(), like_content(), message_content(), 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().

    +

    Referenced by build_sync_packet(), channel_remove(), connect_post(), connections_post(), connedit_content(), connedit_post(), create_identity(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_expire(), item_post(), like_content(), message_content(), 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().

    @@ -1244,7 +1250,7 @@ Variables @@ -1305,7 +1311,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), App\build_pagehead(), channel_content(), check_form_security_token(), community_content(), connections_aside(), connections_content(), connections_post(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), directory_content(), dirsearch_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), notice(), oexchange_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), process_delivery(), profile_photo_post(), profile_sidebar(), profiles_post(), qsearch_init(), redir_init(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeme_post(), rpost_content(), script_path(), search_ac_init(), search_content(), search_init(), search_post(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

    +

    Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), App\build_pagehead(), channel_content(), check_form_security_token(), community_content(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), directory_content(), dirsearch_content(), encode_rel_links(), events_content(), events_post(), feed_init(), filerm_content(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), notice(), oexchange_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), process_delivery(), profile_photo_post(), profile_sidebar(), profiles_post(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeme_post(), rpost_content(), script_path(), search_ac_init(), search_content(), search_init(), search_post(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

    @@ -1339,7 +1345,7 @@ Variables
    -

    Referenced by allowed_public_recips(), bb_parse_crypt(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), widget_archive(), widget_filer(), widget_savedsearch(), widget_suggestions(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    +

    Referenced by allowed_public_recips(), bb_parse_crypt(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), filestorage_content(), follow_init(), format_categories(), format_filer(), group_post(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_store(), layouts_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), photos_list_photos(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), widget_archive(), widget_filer(), widget_savedsearch(), widget_suggestions(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    @@ -1354,7 +1360,7 @@ Variables @@ -1368,7 +1374,7 @@ Variables @@ -1382,7 +1388,7 @@ Variables @@ -1396,7 +1402,7 @@ Variables @@ -1410,7 +1416,7 @@ Variables @@ -1424,7 +1430,7 @@ Variables @@ -1563,7 +1569,6 @@ Variables
    -

    Account roles

    Referenced by account_remove(), create_account(), is_site_admin(), and send_reg_approval_email().

    @@ -1578,9 +1583,22 @@ Variables
    +

    Account roles

    Referenced by item_post(), mimetype_select(), and z_input_filter().

    +
    + + +
    +
    + + + + +
    const ACCOUNT_ROLE_SYSTEM 0x0002
    +
    +
    @@ -2190,7 +2208,7 @@ Variables
    -

    Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), allfriends_content(), api_content(), api_post(), apps_content(), attach_init(), authenticate_success(), blocks_content(), 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(), connect_init(), connections_content(), connections_post(), delegate_content(), directory_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), suggest_content(), tagrm_post(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    +

    Referenced by admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), apps_content(), attach_init(), authenticate_success(), blocks_content(), 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(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), home_content(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), suggest_content(), tagrm_post(), user_allow(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -2606,7 +2624,7 @@ Variables @@ -2675,7 +2693,7 @@ Variables @@ -2761,7 +2779,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(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), FKOAuth1\loginUser(), magic_init(), 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(), zot_register_hub(), and zotfeed_init().

    +

    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(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), FKOAuth1\loginUser(), magic_init(), 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(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), syncdirs(), unload_plugin(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

    @@ -3143,7 +3161,7 @@ Variables @@ -3567,7 +3585,21 @@ Variables + + +
    +
    + + + + +
    const PAGE_SYSTEM 0x1000
    +
    + +

    Referenced by zfinger_init().

    @@ -3750,7 +3782,7 @@ Variables @@ -4060,7 +4092,7 @@ Variables @@ -4400,7 +4432,7 @@ Variables @@ -4444,6 +4476,18 @@ Variables

    Referenced by dirsearch_content(), import_directory_profile(), and import_xchan().

    + + + +
    +
    + + + + +
    const XCHAN_FLAGS_SYSTEM 0x0010
    +
    +
    diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 04dc56157..dc2cf6b5b 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -54,6 +54,7 @@ var boot_8php = [ "ACCOUNT_REMOVED", "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78", null ], [ "ACCOUNT_ROLE_ADMIN", "boot_8php.html#ac8400313df2c831653f9036f71ebd86d", null ], [ "ACCOUNT_ROLE_ALLOWCODE", "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688", null ], + [ "ACCOUNT_ROLE_SYSTEM", "boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b", null ], [ "ACCOUNT_UNVERIFIED", "boot_8php.html#af3a4271630aabd8be592213f925d6a36", null ], [ "ACTIVITY_DISLIKE", "boot_8php.html#a0e57f846e6d47a308feced0f7274f178", null ], [ "ACTIVITY_FAVORITE", "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e", null ], @@ -200,6 +201,7 @@ var boot_8php = [ "PAGE_NORMAL", "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3", null ], [ "PAGE_PREMIUM", "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8", null ], [ "PAGE_REMOVED", "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6", null ], + [ "PAGE_SYSTEM", "boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932", null ], [ "PERMS_A_DELEGATE", "boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b", null ], [ "PERMS_A_REPUBLISH", "boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead", null ], [ "PERMS_CONTACTS", "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6", null ], @@ -263,6 +265,7 @@ var boot_8php = [ "XCHAN_FLAGS_HIDDEN", "boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2", null ], [ "XCHAN_FLAGS_ORPHAN", "boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f", null ], [ "XCHAN_FLAGS_SELFCENSORED", "boot_8php.html#a5a681a672e007cdc22b43345d71f07c6", null ], + [ "XCHAN_FLAGS_SYSTEM", "boot_8php.html#afef254290febac854c85fc698d9483a6", null ], [ "ZCURL_TIMEOUT", "boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af", null ], [ "ZOT_REVISION", "boot_8php.html#a36b31575f992a10b5927b76efba9362e", null ] ]; \ No newline at end of file diff --git a/doc/html/classApp-members.html b/doc/html/classApp-members.html index d13d7f14c..4661adc60 100644 --- a/doc/html/classApp-members.html +++ b/doc/html/classApp-members.html @@ -152,56 +152,57 @@ $(document).ready(function(){initNavTree('classApp.html','');}); $pathAppprivate $permsAppprivate $pluginsApp - $profileApp - $profile_uidApp - $query_stringApp - $rdelimAppprivate - $schemeAppprivate - $sourcenameApp - $stringsApp - $template_engine_instanceApp - $template_enginesApp - $themeAppprivate - $theme_infoApp - $theme_thread_allowApp - $timezoneApp - $userApp - $videoheightApp - $videowidthApp - $widgetlistAppprivate - $widgetsAppprivate - __construct()App - build_pagehead()App - get_account()App - get_apps()App - get_baseurl($ssl=false)App - get_channel()App - get_groups()App - get_hostname()App - get_observer()App - get_path()App - get_perms()App - get_template_engine()App - get_template_ldelim($engine= 'smarty3')App - get_template_rdelim($engine= 'smarty3')App - get_widgets($location= '')App - head_get_icon()App - head_set_icon($icon)App - register_template_engine($class, $name= '')App - set_account($acct)App - set_apps($arr)App - set_baseurl($url)App - set_channel($channel)App - set_groups($g)App - set_hostname($h)App - set_observer($xchan)App - set_pager_itemspage($n)App - set_pager_total($n)App - set_path($p)App - set_perms($perms)App - set_template_engine($engine= 'smarty3')App - set_widget($title, $html, $location= 'aside')App - template_engine($name= '')App + $poiApp + $profileApp + $profile_uidApp + $query_stringApp + $rdelimAppprivate + $schemeAppprivate + $sourcenameApp + $stringsApp + $template_engine_instanceApp + $template_enginesApp + $themeAppprivate + $theme_infoApp + $theme_thread_allowApp + $timezoneApp + $userApp + $videoheightApp + $videowidthApp + $widgetlistAppprivate + $widgetsAppprivate + __construct()App + build_pagehead()App + get_account()App + get_apps()App + get_baseurl($ssl=false)App + get_channel()App + get_groups()App + get_hostname()App + get_observer()App + get_path()App + get_perms()App + get_template_engine()App + get_template_ldelim($engine= 'smarty3')App + get_template_rdelim($engine= 'smarty3')App + get_widgets($location= '')App + head_get_icon()App + head_set_icon($icon)App + register_template_engine($class, $name= '')App + set_account($acct)App + set_apps($arr)App + set_baseurl($url)App + set_channel($channel)App + set_groups($g)App + set_hostname($h)App + set_observer($xchan)App + set_pager_itemspage($n)App + set_pager_total($n)App + set_path($p)App + set_perms($perms)App + set_template_engine($engine= 'smarty3')App + set_widget($title, $html, $location= 'aside')App + template_engine($name= '')App diff --git a/doc/html/classApp.html b/doc/html/classApp.html index 38ed4ada3..3c6d0655e 100644 --- a/doc/html/classApp.html +++ b/doc/html/classApp.html @@ -192,6 +192,8 @@ Public Attributes    $profile_uid = 0   + $poi = null +   $layout = array()    $groups @@ -1454,6 +1456,18 @@ Private Attributes
    +
    + + +
    +
    + + + + +
    App::$poi = null
    +
    +
    diff --git a/doc/html/classApp.js b/doc/html/classApp.js index 51d9daba4..52808c33c 100644 --- a/doc/html/classApp.js +++ b/doc/html/classApp.js @@ -72,6 +72,7 @@ var classApp = [ "$path", "classApp.html#acad5896b7a79ae31433ad8f89606c728", null ], [ "$perms", "classApp.html#ab47de68fa39806d1fb0976407e188b77", null ], [ "$plugins", "classApp.html#ae9f96338f32187d308b67b980eea0008", null ], + [ "$poi", "classApp.html#a1936f2afce0dc0d1bbed15ae1f2ee81a", null ], [ "$profile", "classApp.html#a57d041fcc003d08c127dfa99a02bc192", null ], [ "$profile_uid", "classApp.html#a08c24d6a6fc52fcc784b0f765f13b820", null ], [ "$query_string", "classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f", null ], diff --git a/doc/html/connections_8php.html b/doc/html/connections_8php.html index 28d066222..cd24a6a61 100644 --- a/doc/html/connections_8php.html +++ b/doc/html/connections_8php.html @@ -114,8 +114,6 @@ $(document).ready(function(){initNavTree('connections_8php.html','');}); Functions  connections_init (&$a)   - connections_aside (&$a) -   connections_post (&$a)    connections_clone (&$a) @@ -124,22 +122,6 @@ Functions  

    Function Documentation

    - -
    -
    - - - - - - - - -
    connections_aside ($a)
    -
    - -
    -
    @@ -154,7 +136,7 @@ Functions
    -

    Referenced by connections_content(), and connections_post().

    +

    Referenced by connections_post().

    diff --git a/doc/html/connections_8php.js b/doc/html/connections_8php.js index ecab7efc9..962b1f866 100644 --- a/doc/html/connections_8php.js +++ b/doc/html/connections_8php.js @@ -1,6 +1,5 @@ var connections_8php = [ - [ "connections_aside", "connections_8php.html#af48f7ad20914760ba9874c090384e35a", null ], [ "connections_clone", "connections_8php.html#a15af118efee9c948b6f8294e54a73bb2", null ], [ "connections_content", "connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c", null ], [ "connections_init", "connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558", null ], diff --git a/doc/html/connedit_8php.html b/doc/html/connedit_8php.html new file mode 100644 index 000000000..53c6eeda6 --- /dev/null +++ b/doc/html/connedit_8php.html @@ -0,0 +1,193 @@ + + + + + + +The Red Matrix: mod/connedit.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    connedit.php File Reference
    +
    +
    + + + + + + + + + + +

    +Functions

     connedit_init (&$a)
     
     connedit_post (&$a)
     
     connedit_clone (&$a)
     
     connedit_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    connedit_clone ($a)
    +
    + +

    Referenced by connedit_content(), and connedit_post().

    + +
    +
    + +
    +
    + + + + + + + + +
    connedit_content ($a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    connedit_init ($a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    connedit_post ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/connedit_8php.js b/doc/html/connedit_8php.js new file mode 100644 index 000000000..0492ead35 --- /dev/null +++ b/doc/html/connedit_8php.js @@ -0,0 +1,7 @@ +var connedit_8php = +[ + [ "connedit_clone", "connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5", null ], + [ "connedit_content", "connedit_8php.html#a795acb3d9d841f55c255d7611681ab67", null ], + [ "connedit_init", "connedit_8php.html#a4da871e075597a09a8b374b9171dd92e", null ], + [ "connedit_post", "connedit_8php.html#a234c48426b652bf4d37053f2af329ac5", null ] +]; \ No newline at end of file diff --git a/doc/html/contact__selectors_8php.html b/doc/html/contact__selectors_8php.html index e7dcf48f7..ca9945e46 100644 --- a/doc/html/contact__selectors_8php.html +++ b/doc/html/contact__selectors_8php.html @@ -146,7 +146,7 @@ Functions
    -

    Referenced by connections_content().

    +

    Referenced by connedit_content().

    @@ -164,7 +164,7 @@ Functions
    -

    Referenced by connections_content(), and thing_content().

    +

    Referenced by connedit_content(), and thing_content().

    diff --git a/doc/html/contact__widgets_8php.html b/doc/html/contact__widgets_8php.html index 8c7dc4b33..2af5ba620 100644 --- a/doc/html/contact__widgets_8php.html +++ b/doc/html/contact__widgets_8php.html @@ -207,7 +207,7 @@ Functions diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index 98d877a3b..c2b005065 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -574,7 +574,7 @@ Functions
    -

    Referenced by page_content().

    +

    Referenced by home_content(), and page_content().

    diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 9a5af9023..27fdb2153 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -476,7 +476,7 @@ Functions diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index dd7572f7c..f4f0b0a21 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(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), 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_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), events_post(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), 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_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), 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_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), rconnect_url(), 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(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedInode\setName(), settings_post(), siteinfo_init(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by account_verify_password(), acl_init(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), blocks_content(), 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_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), directory_run(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), events_post(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), home_content(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), 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_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), queue_run(), rconnect_url(), red_zrl_callback(), 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(), photo_driver\save(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedInode\setName(), settings_post(), siteinfo_init(), sources_content(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_directory_entry(), update_modtime(), update_queue_time(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), 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_remove(), account_total(), account_verify_password(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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_destroy(), 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_mkdir(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_init(), connections_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), RedInode\delete(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), first_post_date(), fix_attached_photo_permissions(), 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(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), 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_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_check_service_class(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), pagelist_widget(), pdl_selector(), 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_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), 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(), rconnect_url(), 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(), photo_driver\save(), 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(), RedInode\setName(), settings_aside(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), 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_directory_entry(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_filer(), widget_follow(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), 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_destroy(), 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_mkdir(), attach_store(), authenticate_success(), blocks_content(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), RedDirectory\childExists(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), community_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), RedInode\delete(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dir_tagadelic(), directory_content(), directory_run(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_store(), events_content(), expand_groups(), expire_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), first_post_date(), fix_attached_photo_permissions(), 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(), get_item_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), 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(), home_content(), identity_basic_export(), identity_check_service_class(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_check_service_class(), item_expire(), item_message_id(), item_post(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), manage_content(), match_content(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), page_content(), pagelist_widget(), pdl_selector(), 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_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), public_recips(), queue_run(), random_profile(), rconnect_url(), red_zrl_callback(), 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(), photo_driver\save(), 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(), RedInode\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), 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_directory_entry(), update_modtime(), update_queue_time(), update_suggestions(), user_allow(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_filer(), widget_follow(), widget_savedsearch(), widget_settings_menu(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html index bd41b7e86..d3e4273ec 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html @@ -112,10 +112,6 @@ Files   file  mod_import.php   -file  mod_new_channel.php -  -file  mod_register.php -  file  none.php   file  theme_init.php diff --git a/doc/html/dir_817f6d302394b98e59575acdb59998bc.js b/doc/html/dir_817f6d302394b98e59575acdb59998bc.js index cceba4e93..5aad4b24b 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.js +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.js @@ -4,8 +4,6 @@ var dir_817f6d302394b98e59575acdb59998bc = [ "full.php", "full_8php.html", "full_8php" ], [ "minimal.php", "minimal_8php.html", null ], [ "mod_import.php", "mod__import_8php.html", "mod__import_8php" ], - [ "mod_new_channel.php", "mod__new__channel_8php.html", "mod__new__channel_8php" ], - [ "mod_register.php", "mod__register_8php.html", "mod__register_8php" ], [ "none.php", "none_8php.html", null ], [ "theme_init.php", "php_2theme__init_8php.html", "php_2theme__init_8php" ] ]; \ No newline at end of file diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 7b7f02999..13fdcd134 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -110,8 +110,6 @@ Files   file  admin.php   -file  allfriends.php -  file  api.php   file  apps.php @@ -136,6 +134,8 @@ Files   file  connections.php   +file  connedit.php +  file  contactgroup.php   file  delegate.php @@ -258,12 +258,8 @@ Files   file  pubsites.php   -file  qsearch.php -  file  randprof.php   -file  redir.php -  file  register.php   file  regmod.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index b47296a36..b95fe1e8e 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -3,7 +3,6 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "_well_known.php", "__well__known_8php.html", "__well__known_8php" ], [ "acl.php", "acl_8php.html", "acl_8php" ], [ "admin.php", "admin_8php.html", "admin_8php" ], - [ "allfriends.php", "allfriends_8php.html", "allfriends_8php" ], [ "api.php", "mod_2api_8php.html", "mod_2api_8php" ], [ "apps.php", "apps_8php.html", "apps_8php" ], [ "attach.php", "mod_2attach_8php.html", "mod_2attach_8php" ], @@ -16,6 +15,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "community.php", "community_8php.html", "community_8php" ], [ "connect.php", "connect_8php.html", "connect_8php" ], [ "connections.php", "connections_8php.html", "connections_8php" ], + [ "connedit.php", "connedit_8php.html", "connedit_8php" ], [ "contactgroup.php", "contactgroup_8php.html", "contactgroup_8php" ], [ "delegate.php", "delegate_8php.html", "delegate_8php" ], [ "directory.php", "mod_2directory_8php.html", "mod_2directory_8php" ], @@ -35,7 +35,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "fsuggest.php", "fsuggest_8php.html", "fsuggest_8php" ], [ "group.php", "mod_2group_8php.html", "mod_2group_8php" ], [ "help.php", "help_8php.html", "help_8php" ], - [ "home.php", "home_8php.html", null ], + [ "home.php", "home_8php.html", "home_8php" ], [ "hostxrd.php", "hostxrd_8php.html", "hostxrd_8php" ], [ "import.php", "import_8php.html", "import_8php" ], [ "invite.php", "invite_8php.html", "invite_8php" ], @@ -77,9 +77,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "profiles.php", "profiles_8php.html", "profiles_8php" ], [ "profperm.php", "profperm_8php.html", "profperm_8php" ], [ "pubsites.php", "pubsites_8php.html", "pubsites_8php" ], - [ "qsearch.php", "qsearch_8php.html", "qsearch_8php" ], [ "randprof.php", "randprof_8php.html", "randprof_8php" ], - [ "redir.php", "redir_8php.html", "redir_8php" ], [ "register.php", "register_8php.html", "register_8php" ], [ "regmod.php", "regmod_8php.html", "regmod_8php" ], [ "removeme.php", "removeme_8php.html", "removeme_8php" ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 08972203b..f1a46cb59 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
    -

    Referenced by activity_sanitise(), api_rss_extra(), array_sanitise(), attach_mkdir(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_content(), connections_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), drop_item(), event_store(), feature_enabled(), 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(), ids_to_querystr(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), list_widgets(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), 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(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_post(), remove_community_tag(), replace_macros(), photo_driver\save(), 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(), theme_attachments(), theme_content(), thing_init(), validate_channelname(), wfinger_init(), widget_affinity(), widget_archive(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

    +

    Referenced by activity_sanitise(), api_rss_extra(), array_sanitise(), attach_mkdir(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), drop_item(), event_store(), feature_enabled(), 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(), ids_to_querystr(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), pdl_selector(), 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(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_post(), remove_community_tag(), replace_macros(), photo_driver\save(), 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(), theme_attachments(), theme_content(), thing_init(), validate_channelname(), wfinger_init(), widget_affinity(), widget_archive(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

    @@ -160,7 +160,7 @@ Variables
    -

    Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), message_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), searchbox(), App\set_widget(), siteinfo_content(), smilies(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

    +

    Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), message_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), searchbox(), siteinfo_content(), smilies(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

    diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index e1e853922..69f76c078 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions diff --git a/doc/html/files.html b/doc/html/files.html index c570f79fd..e5f4c0030 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -192,19 +192,19 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*_well_known.php |o*acl.php |o*admin.php -|o*allfriends.php -|o*api.php -|o*apps.php -|o*attach.php -|o*blocks.php -|o*chanman.php -|o*channel.php -|o*chanview.php -|o*cloud.php -|o*common.php -|o*community.php -|o*connect.php -|o*connections.php +|o*api.php +|o*apps.php +|o*attach.php +|o*blocks.php +|o*chanman.php +|o*channel.php +|o*chanview.php +|o*cloud.php +|o*common.php +|o*community.php +|o*connect.php +|o*connections.php +|o*connedit.php |o*contactgroup.php |o*delegate.php |o*directory.php @@ -266,52 +266,50 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*profiles.php |o*profperm.php |o*pubsites.php -|o*qsearch.php -|o*randprof.php -|o*redir.php -|o*register.php -|o*regmod.php -|o*removeme.php -|o*rmagic.php -|o*rpost.php -|o*rsd_xml.php -|o*search.php -|o*search_ac.php -|o*settings.php -|o*setup.php -|o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*sources.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*toggle_safesearch.php -|o*uexport.php -|o*update_channel.php -|o*update_community.php -|o*update_display.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*vote.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*zfinger.php -|o*zotfeed.php -|\*zping.php +|o*randprof.php +|o*register.php +|o*regmod.php +|o*removeme.php +|o*rmagic.php +|o*rpost.php +|o*rsd_xml.php +|o*search.php +|o*search_ac.php +|o*settings.php +|o*setup.php +|o*share.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*sources.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*toggle_safesearch.php +|o*uexport.php +|o*update_channel.php +|o*update_community.php +|o*update_display.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php @@ -334,10 +332,8 @@ $(document).ready(function(){initNavTree('files.html','');}); ||o*full.php ||o*minimal.php ||o*mod_import.php -||o*mod_new_channel.php -||o*mod_register.php -||o*none.php -||\*theme_init.php +||o*none.php +||\*theme_init.php |\+theme | o+apw | |o+php diff --git a/doc/html/full_8php.html b/doc/html/full_8php.html index 2e22f58c7..acfbf2149 100644 --- a/doc/html/full_8php.html +++ b/doc/html/full_8php.html @@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('full_8php.html','');}); - +

    Variables

     if (x($page,'htmlhead')) echo $page['htmlhead']?></head >< body >< nav ><?php if(x($page
     if (x($page,'htmlhead')) echo $page['htmlhead']?></head >< body >< nav ><?php if(x($page
     

    Variable Documentation

    @@ -121,7 +121,7 @@ Variables
    - +
    if(x($page,'htmlhead')) echo $page['htmlhead']?></head >< body >< nav ><?php if(x($pageif(x($page,'htmlhead')) echo $page['htmlhead']?></head >< body >< nav ><?php if(x($page
    diff --git a/doc/html/functions.html b/doc/html/functions.html index 07bf3f97b..64f2b473e 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -343,6 +343,9 @@ $(document).ready(function(){initNavTree('functions.html','');});
  • $plugins : App
  • +
  • $poi +: App +
  • $prepared_item : Conversation
  • diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index ad6f3d122..e130efc78 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -324,6 +324,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
  • $plugins : App
  • +
  • $poi +: App +
  • $prepared_item : Conversation
  • diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index a4bef56e4..8171bd53d 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -213,6 +213,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • ACCOUNT_ROLE_ALLOWCODE : boot.php
  • +
  • ACCOUNT_ROLE_SYSTEM +: boot.php +
  • account_total() : account.php
  • @@ -375,9 +378,6 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • all_friends() : socgraph.php
  • -
  • allfriends_content() -: allfriends.php -
  • allowed_email() : network.php
  • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 6c64df67e..8a5e33aac 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -339,9 +339,6 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • connect_post() : connect.php
  • -
  • connections_aside() -: connections.php -
  • connections_clone() : connections.php
  • @@ -354,6 +351,18 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • connections_post() : connections.php
  • +
  • connedit_clone() +: connedit.php +
  • +
  • connedit_content() +: connedit.php +
  • +
  • connedit_init() +: connedit.php +
  • +
  • connedit_post() +: connedit.php +
  • construct_activity_object() : items.php
  • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index 6065c890b..916f6809c 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -189,6 +189,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
  • get_db_errno() : setup.php
  • +
  • get_default_profile_photo() +: identity.php +
  • get_dim() : datetime.php
  • @@ -312,9 +315,6 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
  • group_add_member() : group.php
  • -
  • group_aside() -: group.php -
  • group_byname() : group.php
  • @@ -340,7 +340,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : acl_selectors.php
  • group_side() -: group.php +: group.php
  • groups_containing() : group.php diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index ef76758fb..7a78e7aae 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -177,6 +177,12 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
  • help_content() : help.php
  • +
  • home_content() +: home.php +
  • +
  • home_init() +: home.php +
  • hostxrd_init() : hostxrd.php
  • diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html index f8b3b2e43..08820eb43 100644 --- a/doc/html/globals_0x6c.html +++ b/doc/html/globals_0x6c.html @@ -180,9 +180,6 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
  • list_public_sites() : dirsearch.php
  • -
  • list_widgets() -: widgets.php -
  • load_config() : config.php
  • diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index c61a2e1e6..4c4f3cc07 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.html @@ -243,9 +243,6 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
  • menu_render() : menu.php
  • -
  • message_aside() -: message.php -
  • message_content() : message.php
  • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index f60daa3d6..732be0fe5 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -146,8 +146,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});

    - p -

    • page : mod_import.php -, mod_new_channel.php -, mod_register.php
    • PAGE_ADULT : boot.php @@ -179,6 +177,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
    • PAGE_REMOVED : boot.php
    • +
    • PAGE_SYSTEM +: boot.php +
    • pagelist_widget() : page_widgets.php
    • diff --git a/doc/html/globals_0x71.html b/doc/html/globals_0x71.html index c495a1b81..2ee22f485 100644 --- a/doc/html/globals_0x71.html +++ b/doc/html/globals_0x71.html @@ -150,9 +150,6 @@ $(document).ready(function(){initNavTree('globals_0x71.html','');});
    • qp() : text.php
    • -
    • qsearch_init() -: qsearch.php -
    • queue_run() : queue.php
    • diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 8822626d2..44466610f 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -186,9 +186,6 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
    • redbasic_init() : theme.php
    • -
    • redir_init() -: redir.php -
    • reduce() : docblox_errorchecker.php
    • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index 79951659d..82d39213c 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -207,9 +207,6 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
    • set_xconfig() : config.php
    • -
    • settings_aside() -: settings.php -
    • settings_init() : settings.php
    • @@ -321,9 +318,6 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
    • subthread_content() : subthread.php
    • -
    • suggest_aside() -: suggest.php -
    • suggest_content() : suggest.php
    • diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html index 2b6c5d703..ecc4ee5cc 100644 --- a/doc/html/globals_0x77.html +++ b/doc/html/globals_0x77.html @@ -183,24 +183,39 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
    • widget_collections() : widgets.php
    • +
    • widget_design_tools() +: widgets.php +
    • widget_filer() : widgets.php
    • +
    • widget_findpeople() +: widgets.php +
    • widget_follow() : widgets.php
    • widget_fullprofile() : widgets.php
    • +
    • widget_mailmenu() +: widgets.php +
    • widget_notes() : widgets.php
    • +
    • widget_photo_albums() +: widgets.php +
    • widget_profile() : widgets.php
    • widget_savedsearch() : widgets.php
    • +
    • widget_settings_menu() +: widgets.php +
    • widget_suggestions() : widgets.php
    • @@ -210,6 +225,9 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
    • widget_tagcloud_wall() : widgets.php
    • +
    • widget_vcard() +: widgets.php +
    • writepages_widget() : page_widgets.php
    • diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html index 4435d4f57..2b6136ac4 100644 --- a/doc/html/globals_0x78.html +++ b/doc/html/globals_0x78.html @@ -165,6 +165,9 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
    • XCHAN_FLAGS_SELFCENSORED : boot.php
    • +
    • XCHAN_FLAGS_SYSTEM +: boot.php +
    • xchan_mail_query() : text.php
    • diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index b1e765e82..0ed363e79 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -239,9 +239,6 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
    • all_friends() : socgraph.php
    • -
    • allfriends_content() -: allfriends.php -
    • allowed_email() : network.php
    • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index d783f629a..f83049a51 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -329,9 +329,6 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
    • connect_post() : connect.php
    • -
    • connections_aside() -: connections.php -
    • connections_clone() : connections.php
    • @@ -344,6 +341,18 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
    • connections_post() : connections.php
    • +
    • connedit_clone() +: connedit.php +
    • +
    • connedit_content() +: connedit.php +
    • +
    • connedit_init() +: connedit.php +
    • +
    • connedit_post() +: connedit.php +
    • construct_activity_object() : items.php
    • diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index ed640de4b..915434398 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -188,6 +188,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
    • get_db_errno() : setup.php
    • +
    • get_default_profile_photo() +: identity.php +
    • get_dim() : datetime.php
    • @@ -302,9 +305,6 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
    • group_add_member() : group.php
    • -
    • group_aside() -: group.php -
    • group_byname() : group.php
    • @@ -330,7 +330,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : acl_selectors.php
    • group_side() -: group.php +: group.php
    • groups_containing() : group.php diff --git a/doc/html/globals_func_0x68.html b/doc/html/globals_func_0x68.html index abab8925b..ca8cf634e 100644 --- a/doc/html/globals_func_0x68.html +++ b/doc/html/globals_func_0x68.html @@ -176,6 +176,12 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');});
    • help_content() : help.php
    • +
    • home_content() +: home.php +
    • +
    • home_init() +: home.php +
    • hostxrd_init() : hostxrd.php
    • diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index 4eaccbd4f..650b6ea8c 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -173,9 +173,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
    • list_public_sites() : dirsearch.php
    • -
    • list_widgets() -: widgets.php -
    • load_config() : config.php
    • diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html index fdd3edaab..d43466984 100644 --- a/doc/html/globals_func_0x6d.html +++ b/doc/html/globals_func_0x6d.html @@ -212,9 +212,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
    • menu_render() : menu.php
    • -
    • message_aside() -: message.php -
    • message_content() : message.php
    • diff --git a/doc/html/globals_func_0x71.html b/doc/html/globals_func_0x71.html index d4e6316bf..196c5a89f 100644 --- a/doc/html/globals_func_0x71.html +++ b/doc/html/globals_func_0x71.html @@ -149,9 +149,6 @@ $(document).ready(function(){initNavTree('globals_func_0x71.html','');});
    • qp() : text.php
    • -
    • qsearch_init() -: qsearch.php -
    • queue_run() : queue.php
    • diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index a1b9af5a9..ae5586300 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -173,9 +173,6 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
    • redbasic_init() : theme.php
    • -
    • redir_init() -: redir.php -
    • reduce() : docblox_errorchecker.php
    • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index 45afdd162..4c27ae318 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -206,9 +206,6 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
    • set_xconfig() : config.php
    • -
    • settings_aside() -: settings.php -
    • settings_init() : settings.php
    • @@ -308,9 +305,6 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
    • subthread_content() : subthread.php
    • -
    • suggest_aside() -: suggest.php -
    • suggest_content() : suggest.php
    • diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html index c91da46b5..42ba67c12 100644 --- a/doc/html/globals_func_0x77.html +++ b/doc/html/globals_func_0x77.html @@ -179,24 +179,39 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
    • widget_collections() : widgets.php
    • +
    • widget_design_tools() +: widgets.php +
    • widget_filer() : widgets.php
    • +
    • widget_findpeople() +: widgets.php +
    • widget_follow() : widgets.php
    • widget_fullprofile() : widgets.php
    • +
    • widget_mailmenu() +: widgets.php +
    • widget_notes() : widgets.php
    • +
    • widget_photo_albums() +: widgets.php +
    • widget_profile() : widgets.php
    • widget_savedsearch() : widgets.php
    • +
    • widget_settings_menu() +: widgets.php +
    • widget_suggestions() : widgets.php
    • @@ -206,6 +221,9 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
    • widget_tagcloud_wall() : widgets.php
    • +
    • widget_vcard() +: widgets.php +
    • writepages_widget() : page_widgets.php
    • diff --git a/doc/html/globals_vars_0x61.html b/doc/html/globals_vars_0x61.html index 8493d5b7d..4c85f18b6 100644 --- a/doc/html/globals_vars_0x61.html +++ b/doc/html/globals_vars_0x61.html @@ -193,6 +193,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x61.html','');});
    • ACCOUNT_ROLE_ALLOWCODE : boot.php
    • +
    • ACCOUNT_ROLE_SYSTEM +: boot.php +
    • ACCOUNT_UNVERIFIED : boot.php
    • diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html index 55e1dd040..02c290708 100644 --- a/doc/html/globals_vars_0x70.html +++ b/doc/html/globals_vars_0x70.html @@ -141,8 +141,6 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});

      - p -

      • page : mod_import.php -, mod_new_channel.php -, mod_register.php
      • PAGE_ADULT : boot.php @@ -168,6 +166,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
      • PAGE_REMOVED : boot.php
      • +
      • PAGE_SYSTEM +: boot.php +
      • PERMS_A_DELEGATE : boot.php
      • diff --git a/doc/html/globals_vars_0x78.html b/doc/html/globals_vars_0x78.html index b115c36a0..4eebc0799 100644 --- a/doc/html/globals_vars_0x78.html +++ b/doc/html/globals_vars_0x78.html @@ -154,6 +154,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x78.html','');});
      • XCHAN_FLAGS_SELFCENSORED : boot.php
      • +
      • XCHAN_FLAGS_SYSTEM +: boot.php +
      diff --git a/doc/html/home_8php.html b/doc/html/home_8php.html index 33376ec42..ec629b7c2 100644 --- a/doc/html/home_8php.html +++ b/doc/html/home_8php.html @@ -103,10 +103,53 @@ $(document).ready(function(){initNavTree('home_8php.html','');});
      +
      home.php File Reference
      + + + + + + +

      +Functions

       home_init (&$a)
       
       home_content (&$a)
       
      +

      Function Documentation

      + +
      +
      + + + + + + + + +
      home_content ($a)
      +
      + +
      +
      + +
      +
      + + + + + + + + +
      home_init ($a)
      +
      + +
      +
      diff --git a/doc/html/home_8php.js b/doc/html/home_8php.js new file mode 100644 index 000000000..e4f6d5dc9 --- /dev/null +++ b/doc/html/home_8php.js @@ -0,0 +1,5 @@ +var home_8php = +[ + [ "home_content", "home_8php.html#aa1cf697851a646755baf537f75334c46", null ], + [ "home_init", "home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde", null ] +]; \ No newline at end of file diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index 82016ca06..af9595a99 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -148,6 +148,8 @@ Functions    get_theme_uid ()   + get_default_profile_photo ($size=175) + 

      Function Documentation

      @@ -243,6 +245,32 @@ Functions
      +
      + + +
      +
      + + + + + + + + +
      get_default_profile_photo ( $size = 175)
      +
      +

      get_default_profile_photo($size = 175) Retrieves the path of the default_profile_photo for this system with the specified size.

      +
      Parameters
      + + +
      int$sizeone of (175, 80, 48)
      +
      +
      +
      Returns
      string
      + +

      Referenced by avatar_img(), import_profile_photo(), and photo_init().

      +
      @@ -432,7 +460,7 @@ Functions

      The channel default theme is also selected for use, unless over-riden elsewhere.

      load/reload current theme info

      -

      Referenced by blocks_content(), channel_init(), common_init(), connect_init(), layouts_content(), page_init(), profile_init(), profile_photo_init(), profiles_init(), profperm_init(), viewconnections_init(), and webpages_content().

      +

      Referenced by blocks_content(), channel_init(), common_init(), connect_init(), layouts_content(), page_init(), photos_init(), profile_init(), profile_photo_init(), profiles_init(), profperm_init(), viewconnections_init(), and webpages_content().

      diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js index a7710c10f..2a6e0bdc4 100644 --- a/doc/html/identity_8php.js +++ b/doc/html/identity_8php.js @@ -5,6 +5,7 @@ var identity_8php = [ "create_dir_account", "identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd", null ], [ "create_identity", "identity_8php.html#a345f4c943d84de502ec6e72d2c813945", null ], [ "get_birthdays", "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ], + [ "get_default_profile_photo", "identity_8php.html#ab1485a26b032956e1496fc08c58b83ed", null ], [ "get_events", "identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ], [ "get_my_address", "identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ], [ "get_my_url", "identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec", null ], diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 335b90d0d..5abb9855e 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions
      -

      Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), cloud_init(), community_content(), create_account(), create_identity(), detect_language(), directory_aside(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), get_max_import_size(), group_content(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

      +

      Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), cloud_init(), community_content(), create_account(), create_identity(), detect_language(), directory_aside(), directory_content(), directory_run(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_default_profile_photo(), get_item_elements(), get_mail_elements(), get_max_import_size(), group_content(), home_content(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

      @@ -324,7 +324,7 @@ Functions
      -

      Referenced by Conversation\__construct(), authenticate_success(), App\build_pagehead(), change_channel(), channel_content(), chanview_content(), community_content(), connect_content(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_theme_uid(), group_content(), invite_content(), invite_post(), item_expire(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), message_content(), network_content(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), and widget_notes().

      +

      Referenced by Conversation\__construct(), authenticate_success(), App\build_pagehead(), change_channel(), channel_content(), chanview_content(), community_content(), connect_content(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_expire(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), message_content(), network_content(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), and widget_notes().

      @@ -468,7 +468,7 @@ Functions diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index cc72d1a96..abd964b15 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -128,8 +128,8 @@ Functions    mini_group_select ($uid, $group= '')   - group_side ($every="contacts", $each="group", $edit=false, $group_id=0, $cid= '', $mode=1) -  + group_side ($every="connections", $each="group", $edit=false, $group_id=0, $cid= '', $mode=1) +   expand_groups ($a)    member_of ($c) @@ -226,7 +226,7 @@ Functions @@ -300,7 +300,7 @@ Functions @@ -366,7 +366,7 @@ Functions - +
      @@ -374,7 +374,7 @@ Functions - + @@ -414,7 +414,7 @@ Functions
      group_side (  $every = "contacts", $every = "connections",
      @@ -442,7 +442,7 @@ Functions
      -

      Referenced by group_side().

      +

      Referenced by group_side().

      diff --git a/doc/html/include_2group_8php.js b/doc/html/include_2group_8php.js index abd215694..d9a775ade 100644 --- a/doc/html/include_2group_8php.js +++ b/doc/html/include_2group_8php.js @@ -8,7 +8,7 @@ var include_2group_8php = [ "group_rec_byhash", "include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245", null ], [ "group_rmv", "include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5", null ], [ "group_rmv_member", "include_2group_8php.html#a540e3ef36f47d47532646be4241f6518", null ], - [ "group_side", "include_2group_8php.html#abdfce3fd8dcf0c46543d190d0530b4a2", null ], + [ "group_side", "include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9", null ], [ "groups_containing", "include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f", null ], [ "member_of", "include_2group_8php.html#a048f6892bfd28852de1b76470df411de", null ], [ "mini_group_select", "include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32", null ] diff --git a/doc/html/include_2photos_8php.html b/doc/html/include_2photos_8php.html index 677c57517..00b54891d 100644 --- a/doc/html/include_2photos_8php.html +++ b/doc/html/include_2photos_8php.html @@ -292,7 +292,7 @@ Functions
      -

      Referenced by photos_init().

      +

      Referenced by widget_photo_albums().

      @@ -320,7 +320,7 @@ Functions diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index d76cf3b7f..a5cf59220 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -830,7 +830,7 @@ Functions diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 4d3a8e489..24bc44a97 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_hubloc(), 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(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bbcode(), blocks_content(), blogtheme_form(), 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(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), construct_page(), contact_block(), contact_poll_interval(), contact_reputation(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), 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(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), list_widgets(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_aside(), message_content(), message_post(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), pdl_selector(), 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(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), rpost_content(), scale_external_images(), search(), search_content(), search_saved_searches(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), 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(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_archive(), widget_filer(), widget_follow(), widget_notes(), widget_savedsearch(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

      +

      Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bbcode(), blocks_content(), blogtheme_form(), 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(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), contact_reputation(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), 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(), help_content(), home_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), menu_content(), menu_post(), message_content(), message_post(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), pdl_selector(), 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(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), rpost_content(), scale_external_images(), search(), search_content(), search_saved_searches(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), 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(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_archive(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

      diff --git a/doc/html/mod_2group_8php.html b/doc/html/mod_2group_8php.html index 7b1c8a85d..e2e9f1fe1 100644 --- a/doc/html/mod_2group_8php.html +++ b/doc/html/mod_2group_8php.html @@ -112,30 +112,12 @@ $(document).ready(function(){initNavTree('mod_2group_8php.html','');}); - -

      Functions

       group_aside (&$a)
       
       group_post (&$a)
       
       group_content (&$a)
       

      Function Documentation

      - -
      -
      - - - - - - - - -
      group_aside ($a)
      -
      - -
      -
      diff --git a/doc/html/mod_2group_8php.js b/doc/html/mod_2group_8php.js index 361f32a48..4484dd52d 100644 --- a/doc/html/mod_2group_8php.js +++ b/doc/html/mod_2group_8php.js @@ -1,6 +1,5 @@ var mod_2group_8php = [ - [ "group_aside", "mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c", null ], [ "group_content", "mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83", null ], [ "group_post", "mod_2group_8php.html#aed1f009b1221348021bb34761160ef35", null ] ]; \ No newline at end of file diff --git a/doc/html/mod_2message_8php.html b/doc/html/mod_2message_8php.html index 4fddb1d45..789353cff 100644 --- a/doc/html/mod_2message_8php.html +++ b/doc/html/mod_2message_8php.html @@ -112,8 +112,6 @@ $(document).ready(function(){initNavTree('mod_2message_8php.html','');}); - -

      Functions

       message_aside (&$a)
       
       message_post (&$a)
       
      if(!function_exists('item_extract_images'))
      @@ -121,22 +119,6 @@ Functions
       

      Function Documentation

      - -
      -
      - - - - - - - - -
      message_aside ($a)
      -
      - -
      -
      diff --git a/doc/html/mod_2message_8php.js b/doc/html/mod_2message_8php.js index 10f9423f9..598b2f323 100644 --- a/doc/html/mod_2message_8php.js +++ b/doc/html/mod_2message_8php.js @@ -1,6 +1,5 @@ var mod_2message_8php = [ - [ "message_aside", "mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7", null ], [ "message_content", "mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79", null ], [ "message_post", "mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718", null ] ]; \ No newline at end of file diff --git a/doc/html/navtree.js b/doc/html/navtree.js index ca237cc06..f5290f2e9 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -37,12 +37,12 @@ var NAVTREEINDEX = [ "BaseObject_8php.html", "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7", -"classFKOAuthDataStore.html#a4edfe2e77ecd2e16ff6b5eb516ed3599", -"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3", -"globals_0x73.html", -"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274", -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1", -"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1" +"classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050", +"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b", +"globals_0x6d.html", +"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a", +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6", +"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index caa304721..108c31845 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -62,11 +62,9 @@ var NAVTREEINDEX0 = "admin_8php.html#af124619fdc278fe2bf14c45ddaa260fb":[5,0,1,2,10], "admin_8php.html#af81f081851791cd15e49e8ff6722dc27":[5,0,1,2,16], "admin_8php.html#afef415e4011607fbb665610441595015":[5,0,1,2,0], -"allfriends_8php.html":[5,0,1,3], -"allfriends_8php.html#aad992ddbb5f20e81c5cf2259718aec83":[5,0,1,3,0], "annotated.html":[4,0], -"apps_8php.html":[5,0,1,5], -"apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c":[5,0,1,5,0], +"apps_8php.html":[5,0,1,4], +"apps_8php.html#a546016cb960d0b110ee8e489dfa6c27c":[5,0,1,4,0], "apw_2php_2style_8php.html":[5,0,3,1,0,0,1], "apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,0,0,1,0], "apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,0,0,1,1], @@ -95,8 +93,8 @@ var NAVTREEINDEX0 = "bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,7], "bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f":[5,0,0,10,0], "bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,3], -"blocks_8php.html":[5,0,1,7], -"blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0], +"blocks_8php.html":[5,0,1,6], +"blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,6,0], "blogga_2php_2theme_8php.html":[5,0,3,1,1,0,2], "blogga_2php_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b":[5,0,3,1,1,0,2,0], "blogga_2view_2theme_2blog_2theme_8php.html":[5,0,3,1,1,1,0,0,2], @@ -106,148 +104,150 @@ var NAVTREEINDEX0 = "blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae":[5,0,3,1,1,1,0,0,2,1], "blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec":[5,0,3,1,1,1,0,0,2,4], "boot_8php.html":[5,0,4], -"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,128], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,129], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,34], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,142], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,236], +"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,143], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,238], "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,50], -"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,158], +"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,159], "boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,42], -"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,98], +"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,99], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[5,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,197], -"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,63], -"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,162], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,253], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,249], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,252], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,198], +"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,64], +"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,163], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,255], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,251], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,254], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,21], -"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,55], +"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,56], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15], -"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,73], -"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,77], -"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,74], -"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,188], -"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,58], -"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,141], -"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,137], -"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,161], -"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,131], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,260], -"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,230], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,261], -"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,165], -"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,72], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,209], -"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,100], -"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,148], -"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,181], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,232], +"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,74], +"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,78], +"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,75], +"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,189], +"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,59], +"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,142], +"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,138], +"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,162], +"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,132], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,262], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,232], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,263], +"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,166], +"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,73], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,211], +"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,101], +"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,149], +"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,182], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,234], "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,37], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,20], -"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,96], -"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,88], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,242], -"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,184], -"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,79], -"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,123], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,207], -"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,101], -"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,228], -"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,180], -"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,120], -"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,64], -"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,69], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,214], -"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,135], +"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,97], +"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,89], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,244], +"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,185], +"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,80], +"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,124], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,209], +"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,102], +"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,230], +"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,181], +"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,121], +"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,65], +"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,70], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,216], +"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,136], "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,39], -"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,113], -"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,150], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,264], -"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,169], -"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,103], -"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,108], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,263], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,205], +"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,114], +"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,151], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,267], +"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,170], +"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,104], +"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,109], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,266], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,207], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12], -"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,56], -"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,86], +"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,57], +"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,87], "boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,48], -"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,124], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,200], -"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,179], -"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,85], -"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,155], -"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,145], -"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,67], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,250], -"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,167], -"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,99], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,222], -"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,166], +"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,125], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,202], +"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,180], +"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,86], +"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,156], +"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,146], +"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,68], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,252], +"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,168], +"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,100], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,224], +"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,167], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,199], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,218], -"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,191], -"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,149], +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,200], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,220], +"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,192], +"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,150], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,38], -"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,78], +"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,79], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,31], -"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,183], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,217], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,262], +"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,184], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,219], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,264], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,19], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,57], -"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,173], -"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,195], -"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,75], -"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,153], -"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,196], +"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,58], +"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,174], +"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,196], +"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,76], +"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,154], +"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,197], "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,18], -"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,71], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,246], -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,159], -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,133], -"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,136], +"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,72], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,248], +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,160], +"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,134], +"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,137], "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,41], -"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,139], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,234], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,221], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,215], -"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,97], -"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,89], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,203], -"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,122], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,233], +"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,140], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,236], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,223], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,217], +"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,98], +"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,90], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,205], +"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,123], +"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[5,0,4,201], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,235], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,26], -"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,174], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,126], -"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,68], +"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,175], +"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,127], +"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,69], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,254], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,256], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4], -"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,70], -"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,83], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,224], -"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,109], -"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,61], -"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,125], -"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,154], -"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,65], -"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[5,0,4,102], -"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,156], +"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,71], +"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,84], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,226], +"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,110], +"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,62], +"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,126], +"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,155], +"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,66], +"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[5,0,4,103], +"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[5,0,4,54], +"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,157], "boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,45], -"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,80], -"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,111], -"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,193], +"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,81], +"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,112], +"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,194], "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,49], -"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,106], +"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,107], "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,53], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,118], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,245], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,244], -"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,172], +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,119], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,247], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,246], +"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,173], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,16], -"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,94], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,219] +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,95], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,221] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 516ba1cee..886ded9c8 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,150 +1,152 @@ var NAVTREEINDEX1 = { -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,121], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,115], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,226], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,122], +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,116], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,228], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,29], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], -"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,140], -"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,119], -"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,117], -"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,256], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,231], +"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,141], +"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,120], +"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,118], +"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,258], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,233], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,17], -"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,186], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,220], +"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,187], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,222], "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,44], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,212], -"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,187], -"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,259], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,247], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,211], -"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,175], +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,214], +"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,188], +"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,261], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,249], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,213], +"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,176], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,24], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,194], +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,195], "boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,40], -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,147], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,148], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,144], -"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[5,0,4,105], -"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,82], -"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,91], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,216], -"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,130], -"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,201], -"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,62], -"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,178], -"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,110], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,202], +"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,145], +"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[5,0,4,106], +"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,83], +"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,92], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,218], +"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,131], +"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,203], +"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,63], +"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,179], +"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,111], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,204], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,30], -"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,198], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,223], -"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,171], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,206], -"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,104], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,132], +"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,199], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,225], +"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,172], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,208], +"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,105], +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,133], "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,51], -"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,189], +"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,190], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7], -"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,93], +"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,94], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,35], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,227], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,229], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,251], -"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,60], -"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,107], -"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,92], -"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,116], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,253], +"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,61], +"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,108], +"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,93], +"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,117], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,23], -"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,157], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,225], -"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,90], +"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,158], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,227], +"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,91], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,33], "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,52], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,257], -"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,112], -"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,114], -"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,185], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,259], +"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,113], +"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,115], +"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,186], "boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,32], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8], -"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,160], -"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,258], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,213], -"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,192], -"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,59], -"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,143], -"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,151], +"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,161], +"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,260], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,215], +"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,193], +"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,60], +"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,144], +"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,152], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[5,0,4,10], -"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,66], -"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,81], +"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,67], +"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,82], "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,27], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,208], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,235], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,229], -"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,87], -"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,127], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,238], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,210], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,237], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,231], +"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,88], +"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,128], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,240], "boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,36], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,22], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,243], -"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,168], -"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,146], -"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,176], -"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,255], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,245], +"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,169], +"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,147], +"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,177], +"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,257], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,25], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,248], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,250], "boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,46], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,210], -"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,239], -"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,152], -"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,95], -"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,163], -"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,177], -"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,129], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,212], +"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,241], +"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,153], +"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,96], +"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,164], +"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,178], +"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,130], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,28], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,240], -"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,170], -"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,54], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,242], +"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,171], +"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,55], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,47], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,134], -"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,190], -"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,84], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,237], -"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,182], -"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,164], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,241], +"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,135], +"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,191], +"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,85], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,239], +"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,183], +"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,165], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,243], "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,43], -"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,76], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,138], +"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,77], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,139], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,204], +"boot_8php.html#afef254290febac854c85fc698d9483a6":[5,0,4,265], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,206], "cache_8php.html":[5,0,0,11], -"channel_8php.html":[5,0,1,9], -"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,9,0], -"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,9,1], -"chanview_8php.html":[5,0,1,10], -"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[5,0,1,10,0], +"channel_8php.html":[5,0,1,8], +"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,8,0], +"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,8,1], +"chanview_8php.html":[5,0,1,9], +"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[5,0,1,9,0], "classApp.html":[4,0,5], "classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3":[4,0,5,56], "classApp.html#a050b0696118da47e8b30859ad1a2c149":[4,0,5,40], "classApp.html#a084e03c77686d8c13390fef3f7428a2b":[4,0,5,5], "classApp.html#a08bc87aff64f39fbc084e9d6545cee4d":[4,0,5,2], -"classApp.html#a08c24d6a6fc52fcc784b0f765f13b820":[4,0,5,73], +"classApp.html#a08c24d6a6fc52fcc784b0f765f13b820":[4,0,5,74], "classApp.html#a08f0537964d98958d218066364cff785":[4,0,5,1], "classApp.html#a0ce85be198e46570366cb3344f3c55b8":[4,0,5,50], "classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d":[4,0,5,59], "classApp.html#a123b903dfe5d3488cc68db3471d36fd2":[4,0,5,30], -"classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11":[4,0,5,77], +"classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11":[4,0,5,78], "classApp.html#a14bd4b1c29f3aff371fe5d4cb11aeea3":[4,0,5,32], +"classApp.html#a1936f2afce0dc0d1bbed15ae1f2ee81a":[4,0,5,72], "classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f":[4,0,5,60], "classApp.html#a1ad3bb1b68439b3b7cbe630918e618d2":[4,0,5,8], "classApp.html#a20d1890cc16b22ba79eeb0cbf2f719f7":[4,0,5,29], "classApp.html#a230e975296cf164da2fee35ef720964f":[4,0,5,33], -"classApp.html#a244b2d53b21be269aad2269d23192f95":[4,0,5,75], +"classApp.html#a244b2d53b21be269aad2269d23192f95":[4,0,5,76], "classApp.html#a256360c9184fed6d7556e0bc0a835d7f":[4,0,5,48], -"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,74], +"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,75], "classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a":[4,0,5,12], "classApp.html#a330410a288f3393d53772f5e98f857ea":[4,0,5,51], "classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[4,0,5,65], @@ -153,8 +155,8 @@ var NAVTREEINDEX1 = "classApp.html#a3d84af5e42082098672531cd1a618853":[4,0,5,22], "classApp.html#a4659785d13e4bac0bed50dbb1b0d4299":[4,0,5,6], "classApp.html#a4776d9322edea17fae56afa5d01a323e":[4,0,5,24], -"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[4,0,5,88], -"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,83], +"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[4,0,5,89], +"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,84], "classApp.html#a495ec082c2719314e536070ca1ce073d":[4,0,5,42], "classApp.html#a4b67935096f66d1f14b657399a8461ac":[4,0,5,67], "classApp.html#a4bdd7bfed62f50515fce652127bf481b":[4,0,5,25], @@ -163,35 +165,35 @@ var NAVTREEINDEX1 = "classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[4,0,5,9], "classApp.html#a557d7b779d8259027f4724ebf7b248dc":[4,0,5,28], "classApp.html#a560189f048d3db2f526841963cc43e97":[4,0,5,26], -"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[4,0,5,86], -"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[4,0,5,72], +"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[4,0,5,87], +"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[4,0,5,73], "classApp.html#a58ac598544892ff7c32890291b72635e":[4,0,5,61], "classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[4,0,5,62], "classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad":[4,0,5,3], "classApp.html#a5cfc098c061b7d765add58fd2ca97445":[4,0,5,39], -"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,78], +"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,79], "classApp.html#a604d659d6977a99de42a160343e5289a":[4,0,5,4], "classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2":[4,0,5,45], "classApp.html#a622eace13f8fc9f4b5672a68e2bc4396":[4,0,5,7], -"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[4,0,5,79], -"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[4,0,5,80], +"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[4,0,5,80], +"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[4,0,5,81], "classApp.html#a6bcb19cdc4907077da72864686d5a780":[4,0,5,68], "classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[4,0,5,64], "classApp.html#a6f55d087e1ff4710132c1b0863faa2ee":[4,0,5,47], -"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[4,0,5,81], +"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[4,0,5,82], "classApp.html#a78788f6e9d8b713b138f81e457c5cd08":[4,0,5,20], "classApp.html#a7954862f44f606b0ff83d4c74d15e792":[4,0,5,57], "classApp.html#a871898becd0697d778f36d9336253ae8":[4,0,5,14], "classApp.html#a8863703a0305eaa45eb970dbd2046291":[4,0,5,16], "classApp.html#a89e9feb2bfb5253883a9720beaffe876":[4,0,5,21], -"classApp.html#a91fd3c8b89016113b05f3be24805ccff":[4,0,5,85], +"classApp.html#a91fd3c8b89016113b05f3be24805ccff":[4,0,5,86], "classApp.html#a94a1ed2dc493c58612d17035b74ae736":[4,0,5,31], "classApp.html#a98ef4cfd36693a3457c879b76bc6d694":[4,0,5,44], "classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d":[4,0,5,63], -"classApp.html#aa5a87c46ab3fee21362c466bf78042ef":[4,0,5,89], +"classApp.html#aa5a87c46ab3fee21362c466bf78042ef":[4,0,5,90], "classApp.html#aab23c59172310fd30f2d60dc039d3eea":[4,0,5,13], "classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e":[4,0,5,38], -"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,84], +"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,85], "classApp.html#ab3da757abe5cb45bf88f07cc51a73b58":[4,0,5,35], "classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,70], "classApp.html#abe0e4fa91097f7a6588e1213a834121c":[4,0,5,37], @@ -203,16 +205,16 @@ var NAVTREEINDEX1 = "classApp.html#ac73dc90e4764497e2f1b7e6612c8fb88":[4,0,5,43], "classApp.html#acad5896b7a79ae31433ad8f89606c728":[4,0,5,69], "classApp.html#acb27e607fe4c82603444676e25c36b70":[4,0,5,11], -"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,76], +"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,77], "classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0":[4,0,5,41], "classApp.html#ad5175536561021548ae8188e24c7b80c":[4,0,5,36], "classApp.html#adb060d5c7f35a521ec7ec0effbe08097":[4,0,5,27], "classApp.html#adb5a4bb657881e553978ff390babd01f":[4,0,5,10], -"classApp.html#adf2aaf95b062736a6fd5fc70fadf80e8":[4,0,5,87], +"classApp.html#adf2aaf95b062736a6fd5fc70fadf80e8":[4,0,5,88], "classApp.html#ae3f47830543d0d902f66913def8db66b":[4,0,5,53], "classApp.html#ae9f96338f32187d308b67b980eea0008":[4,0,5,71], "classApp.html#aeb1fe1c8ad9aa639909bd183ce578536":[4,0,5,18], -"classApp.html#aeca29fd4f7192ca07369b3c598c36e67":[4,0,5,82], +"classApp.html#aeca29fd4f7192ca07369b3c598c36e67":[4,0,5,83], "classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166":[4,0,5,15], "classApp.html#af5007c42a693afd9c4899c243b2e1363":[4,0,5,49], "classApp.html#af58db526040829b1c8bd95561b329262":[4,0,5,34], @@ -247,7 +249,5 @@ var NAVTREEINDEX1 = "classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f":[4,0,13,1], "classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6":[4,0,13,0], "classFKOAuthDataStore.html":[4,0,14], -"classFKOAuthDataStore.html#a1148d47b546350bf440bdd92792c5df1":[4,0,14,1], -"classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050":[4,0,14,5], -"classFKOAuthDataStore.html#a434882f03e3cdb171ed89e09e337e934":[4,0,14,4] +"classFKOAuthDataStore.html#a1148d47b546350bf440bdd92792c5df1":[4,0,14,1] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 6b6980037..160e9d557 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,7 @@ var NAVTREEINDEX2 = { +"classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050":[4,0,14,5], +"classFKOAuthDataStore.html#a434882f03e3cdb171ed89e09e337e934":[4,0,14,4], "classFKOAuthDataStore.html#a4edfe2e77ecd2e16ff6b5eb516ed3599":[4,0,14,2], "classFKOAuthDataStore.html#a96f76387c3a93b0abe27a98013804bab":[4,0,14,3], "classFKOAuthDataStore.html#aa1a268be88ad3979bb4cc35bbb4dc819":[4,0,14,0], @@ -210,8 +212,8 @@ var NAVTREEINDEX2 = "cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[5,0,0,13,0], "cli__suggest_8php.html":[5,0,0,14], "cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[5,0,0,14,0], -"cloud_8php.html":[5,0,1,11], -"cloud_8php.html#a080071b784fe01d04ed6c09d9f2785b8":[5,0,1,11,1], +"cloud_8php.html":[5,0,1,10], +"cloud_8php.html#a080071b784fe01d04ed6c09d9f2785b8":[5,0,1,10,1], "comanche_8php.html":[5,0,0,15], "comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[5,0,0,15,4], "comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[5,0,0,15,2], @@ -221,33 +223,31 @@ var NAVTREEINDEX2 = "comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f":[5,0,0,15,6], "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,15,5], "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,15,7], -"common_8php.html":[5,0,1,12], -"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,12,0], -"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,12,1], -"community_8php.html":[5,0,1,13], -"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,13,0], -"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,13,1], -"connect_8php.html":[5,0,1,14], -"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,14,2], -"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,14,0], -"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,14,1], -"connections_8php.html":[5,0,1,15], -"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,15,4], -"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,15,1], -"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,15,3], -"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,15,2], -"connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,15,0], +"common_8php.html":[5,0,1,11], +"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,11,0], +"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,11,1], +"community_8php.html":[5,0,1,12], +"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,12,0], +"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,12,1], +"connect_8php.html":[5,0,1,13], +"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,13,2], +"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,13,0], +"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,13,1], +"connections_8php.html":[5,0,1,14], +"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,14,3], +"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,14,0], +"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,14,2], +"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,14,1], +"connedit_8php.html":[5,0,1,15], +"connedit_8php.html#a234c48426b652bf4d37053f2af329ac5":[5,0,1,15,3], +"connedit_8php.html#a4da871e075597a09a8b374b9171dd92e":[5,0,1,15,2], +"connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5":[5,0,1,15,0], +"connedit_8php.html#a795acb3d9d841f55c255d7611681ab67":[5,0,1,15,1], "contact__selectors_8php.html":[5,0,0,18], "contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,18,1], "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,18,0], "contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,18,3], "contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,18,2], "contact__widgets_8php.html":[5,0,0,19], -"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,19,0], -"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,19,2], -"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,19,1], -"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,19,3], -"contactgroup_8php.html":[5,0,1,16], -"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,16,0], -"conversation_8php.html":[5,0,0,20] +"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,19,0] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 0a8edd5de..5415cbcb0 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,11 @@ var NAVTREEINDEX3 = { +"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,19,2], +"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,19,1], +"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,19,3], +"contactgroup_8php.html":[5,0,1,16], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,16,0], +"conversation_8php.html":[5,0,0,20], "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,20,7], "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,20,9], "conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,0,20,16], @@ -229,8 +235,8 @@ var NAVTREEINDEX3 = "functions_func_0x74.html":[4,3,1,17], "functions_func_0x76.html":[4,3,1,18], "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], @@ -243,11 +249,5 @@ var NAVTREEINDEX3 = "globals_0x69.html":[5,1,0,10], "globals_0x6a.html":[5,1,0,11], "globals_0x6b.html":[5,1,0,12], -"globals_0x6c.html":[5,1,0,13], -"globals_0x6d.html":[5,1,0,14], -"globals_0x6e.html":[5,1,0,15], -"globals_0x6f.html":[5,1,0,16], -"globals_0x70.html":[5,1,0,17], -"globals_0x71.html":[5,1,0,18], -"globals_0x72.html":[5,1,0,19] +"globals_0x6c.html":[5,1,0,13] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 942f2f0f7..06c60cd20 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,11 @@ var NAVTREEINDEX4 = { +"globals_0x6d.html":[5,1,0,14], +"globals_0x6e.html":[5,1,0,15], +"globals_0x6f.html":[5,1,0,16], +"globals_0x70.html":[5,1,0,17], +"globals_0x71.html":[5,1,0,18], +"globals_0x72.html":[5,1,0,19], "globals_0x73.html":[5,1,0,20], "globals_0x74.html":[5,1,0,21], "globals_0x75.html":[5,1,0,22], @@ -34,8 +40,8 @@ var NAVTREEINDEX4 = "globals_func_0x77.html":[5,1,1,23], "globals_func_0x78.html":[5,1,1,24], "globals_func_0x7a.html":[5,1,1,25], -"globals_vars.html":[5,1,2,0], "globals_vars.html":[5,1,2], +"globals_vars.html":[5,1,2,0], "globals_vars_0x61.html":[5,1,2,1], "globals_vars_0x63.html":[5,1,2,2], "globals_vars_0x64.html":[5,1,2,3], @@ -65,6 +71,8 @@ var NAVTREEINDEX4 = "help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,34,0], "hierarchy.html":[4,2], "home_8php.html":[5,0,1,35], +"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,35,0], +"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,35,1], "hostxrd_8php.html":[5,0,1,36], "hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,36,0], "html2bbcode_8php.html":[5,0,0,36], @@ -79,23 +87,24 @@ var NAVTREEINDEX4 = "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,37,1], "identity_8php.html":[5,0,0,38], "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,38,3], -"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,38,9], -"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,38,13], -"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,38,12], -"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,38,6], -"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,38,16], -"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,38,17], +"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,38,10], +"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,38,14], +"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,38,13], +"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,38,7], +"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,38,17], +"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,38,18], "identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,38,1], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,14], -"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,38,7], +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,15], +"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,38,8], "identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,38,0], -"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,38,8], +"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,38,9], +"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,38,5], "identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,38,2], -"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,10], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,11], "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,38,4], -"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,38,11], -"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,38,5], -"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,38,15], +"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,38,12], +"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,38,6], +"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,38,16], "import_8php.html":[5,0,1,37], "import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,37,1], "import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,37,0], @@ -189,10 +198,10 @@ var NAVTREEINDEX4 = "include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,35,6], "include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,35,7], "include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,35,4], +"include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9":[5,0,0,35,8], "include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,35,5], "include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32":[5,0,0,35,11], "include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,35,3], -"include_2group_8php.html#abdfce3fd8dcf0c46543d190d0530b4a2":[5,0,0,35,8], "include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,35,9], "include_2menu_8php.html":[5,0,0,43], "include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,43,1], @@ -240,14 +249,5 @@ var NAVTREEINDEX4 = "include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[5,0,0,50,7], "include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[5,0,0,50,1], "include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[5,0,0,50,4], -"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,50,3], -"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,50,6], -"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,50,0], -"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,50,2], -"include_2photos_8php.html":[5,0,0,55], -"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,55,0], -"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,55,2], -"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,55,1], -"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,55,7], -"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,55,3] +"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,50,3] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index c4756ba10..d6e5085ff 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,14 @@ var NAVTREEINDEX5 = { +"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,50,6], +"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,50,0], +"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,50,2], +"include_2photos_8php.html":[5,0,0,55], +"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,55,0], +"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,55,2], +"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,55,1], +"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,55,7], +"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,55,3], "include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,55,6], "include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,55,5], "include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,55,4], @@ -114,13 +123,13 @@ var NAVTREEINDEX5 = "mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,50,2], "mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,50,0], "mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,50,1], -"mod_2api_8php.html":[5,0,1,4], -"mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[5,0,1,4,2], -"mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[5,0,1,4,0], -"mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2":[5,0,1,4,1], -"mod_2attach_8php.html":[5,0,1,6], -"mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1":[5,0,1,6,0], -"mod_2chanman_8php.html":[5,0,1,8], +"mod_2api_8php.html":[5,0,1,3], +"mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[5,0,1,3,2], +"mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[5,0,1,3,0], +"mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2":[5,0,1,3,1], +"mod_2attach_8php.html":[5,0,1,5], +"mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1":[5,0,1,5,0], +"mod_2chanman_8php.html":[5,0,1,7], "mod_2directory_8php.html":[5,0,1,18], "mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,18,2], "mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,18,0], @@ -129,16 +138,14 @@ var NAVTREEINDEX5 = "mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,31,1], "mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,31,0], "mod_2group_8php.html":[5,0,1,33], -"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,33,1], -"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,33,0], -"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,33,2], +"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,33,0], +"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,33,1], "mod_2menu_8php.html":[5,0,1,48], "mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,48,0], "mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,48,1], "mod_2message_8php.html":[5,0,1,49], -"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,49,2], -"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,49,1], -"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,49,0], +"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,49,1], +"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,49,0], "mod_2network_8php.html":[5,0,1,53], "mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,53,1], "mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,53,0], @@ -153,10 +160,6 @@ var NAVTREEINDEX5 = "mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,64,1], "mod__import_8php.html":[5,0,3,0,3], "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,3,0], -"mod__new__channel_8php.html":[5,0,3,0,4], -"mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,4,0], -"mod__register_8php.html":[5,0,3,0,5], -"mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,5,0], "mood_8php.html":[5,0,1,51], "mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,51,0], "mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,51,1], @@ -164,10 +167,10 @@ var NAVTREEINDEX5 = "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,52,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], -"namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], -"namespacefriendica-to-smarty-tpl.html":[3,0,2], +"namespaceacl__selectors.html":[4,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], +"namespacefriendica-to-smarty-tpl.html":[3,0,2], "namespacemembers.html":[3,1,0], "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], @@ -183,7 +186,7 @@ var NAVTREEINDEX5 = "new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,54,2], "new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,54,1], "new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,54,0], -"none_8php.html":[5,0,3,0,6], +"none_8php.html":[5,0,3,0,4], "notes_8php.html":[5,0,1,55], "notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[5,0,1,55,0], "notifications_8php.html":[5,0,1,56], @@ -244,10 +247,7 @@ var NAVTREEINDEX5 = "php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178":[5,0,2,6,2], "php_2default_8php.html":[5,0,3,0,0], "php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,0], -"php_2theme__init_8php.html":[5,0,3,0,7], -"php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,7,0], -"php_8php.html":[5,0,1,65], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,65,0], -"pine_8php.html":[5,0,3,1,0,1,8], -"ping_8php.html":[5,0,1,66] +"php_2theme__init_8php.html":[5,0,3,0,5], +"php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,5,0], +"php_8php.html":[5,0,1,65] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 6c08416b4..82557738b 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,8 @@ var NAVTREEINDEX6 = { +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,65,0], +"pine_8php.html":[5,0,3,1,0,1,8], +"ping_8php.html":[5,0,1,66], "ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,66,0], "plugin_8php.html":[5,0,0,56], "plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,21], @@ -92,15 +95,13 @@ var NAVTREEINDEX6 = "profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,75,0], "pubsites_8php.html":[5,0,1,76], "pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,76,0], -"qsearch_8php.html":[5,0,1,77], -"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,77,0], "queue_8php.html":[5,0,0,60], "queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,60,0], "queue__fn_8php.html":[5,0,0,61], "queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,61,1], "queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,61,0], -"randprof_8php.html":[5,0,1,78], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,78,0], +"randprof_8php.html":[5,0,1,77], +"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,77,0], "redbasic_2php_2style_8php.html":[5,0,3,1,2,0,1], "redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,1,2,0,1,12], "redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4":[5,0,3,1,2,0,1,16], @@ -133,32 +134,30 @@ var NAVTREEINDEX6 = "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,2,0,2,0], "redbasic_8php.html":[5,0,3,1,0,1,9], "reddav_8php.html":[5,0,0,62], -"redir_8php.html":[5,0,1,79], -"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,79,0], -"register_8php.html":[5,0,1,80], -"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,80,0], -"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,80,2], -"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,80,1], -"regmod_8php.html":[5,0,1,81], -"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,81,0], -"removeme_8php.html":[5,0,1,82], -"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,82,0], -"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,82,1], -"rmagic_8php.html":[5,0,1,83], -"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,83,0], -"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,83,2], -"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,83,1], -"rpost_8php.html":[5,0,1,84], -"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,84,0], -"rsd__xml_8php.html":[5,0,1,85], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,85,0], -"search_8php.html":[5,0,1,86], -"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,86,2], -"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,86,3], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,86,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,86,1], -"search__ac_8php.html":[5,0,1,87], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,87,0], +"register_8php.html":[5,0,1,78], +"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,78,0], +"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,78,2], +"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,78,1], +"regmod_8php.html":[5,0,1,79], +"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,79,0], +"removeme_8php.html":[5,0,1,80], +"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,80,0], +"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,80,1], +"rmagic_8php.html":[5,0,1,81], +"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,81,0], +"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,81,2], +"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,81,1], +"rpost_8php.html":[5,0,1,82], +"rpost_8php.html#a8190354d789000806d9879aea276728f":[5,0,1,82,0], +"rsd__xml_8php.html":[5,0,1,83], +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,83,0], +"search_8php.html":[5,0,1,84], +"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,84,2], +"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,84,3], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,84,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,84,1], +"search__ac_8php.html":[5,0,1,85], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,85,0], "security_8php.html":[5,0,0,63], "security_8php.html#a15e0f8f511cc06192db63387f97238b3":[5,0,0,63,11], "security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,63,2], @@ -183,37 +182,36 @@ var NAVTREEINDEX6 = "session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,64,3], "session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,64,9], "session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,64,2], -"settings_8php.html":[5,0,1,88], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,88,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,88,2], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,88,3], -"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,88,1], -"setup_8php.html":[5,0,1,89], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,89,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,89,13], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,89,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,89,12], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,89,9], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,89,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,89,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,89,7], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,89,11], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,89,4], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,89,10], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,89,8], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,89,15], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,89,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,89,14], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,89,6], -"share_8php.html":[5,0,1,90], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,90,0], -"siteinfo_8php.html":[5,0,1,91], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,91,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,91,0], -"sitelist_8php.html":[5,0,1,92], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,92,0], -"smilies_8php.html":[5,0,1,93], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,93,0], +"settings_8php.html":[5,0,1,86], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,86,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,86,1], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,86,2], +"setup_8php.html":[5,0,1,87], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,87,2], +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,87,13], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,87,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,87,12], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,87,9], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,87,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,87,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,87,7], +"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,87,11], +"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,87,4], +"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,87,10], +"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,87,8], +"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,87,15], +"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,87,0], +"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,87,14], +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,87,6], +"share_8php.html":[5,0,1,88], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,88,0], +"siteinfo_8php.html":[5,0,1,89], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,89,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,89,0], +"sitelist_8php.html":[5,0,1,90], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,90,0], +"smilies_8php.html":[5,0,1,91], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,91,0], "socgraph_8php.html":[5,0,0,65], "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,65,0], "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,65,6], @@ -224,24 +222,23 @@ var NAVTREEINDEX6 = "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,65,2], "socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,65,5], "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,65,3], -"sources_8php.html":[5,0,1,94], -"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,94,0], -"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,94,1], -"starred_8php.html":[5,0,1,95], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,95,0], -"subthread_8php.html":[5,0,1,96], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,96,0], -"suggest_8php.html":[5,0,1,97], -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,97,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,97,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,97,2], +"sources_8php.html":[5,0,1,92], +"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[5,0,1,92,0], +"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[5,0,1,92,1], +"starred_8php.html":[5,0,1,93], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,93,0], +"subthread_8php.html":[5,0,1,94], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,94,0], +"suggest_8php.html":[5,0,1,95], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,95,0], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,95,1], "system__unavailable_8php.html":[5,0,0,66], "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,66,0], -"tagger_8php.html":[5,0,1,98], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,98,0], -"tagrm_8php.html":[5,0,1,99], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,99,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,99,0], +"tagger_8php.html":[5,0,1,96], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,96,0], +"tagrm_8php.html":[5,0,1,97], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,97,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,97,0], "taxonomy_8php.html":[5,0,0,67], "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,67,8], "taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[5,0,0,67,0], @@ -249,5 +246,8 @@ var NAVTREEINDEX6 = "taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,67,6], "taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,67,4], "taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,67,3], -"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,67,9] +"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,67,9], +"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,67,1], +"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,67,13], +"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,67,12] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index f17235309..173e233a8 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,8 +1,5 @@ var NAVTREEINDEX7 = { -"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,67,1], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,67,13], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,67,12], "taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,67,10], "taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,67,7], "taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,67,11], @@ -111,13 +108,13 @@ var NAVTREEINDEX7 = "theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539":[5,0,3,1,1,1,0,0,1,1], "theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a":[5,0,3,1,1,1,0,0,1,0], "theme_2redbasic_2php_2theme__init_8php.html":[5,0,3,1,2,0,3], -"thing_8php.html":[5,0,1,100], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,100,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,100,1], -"toggle__mobile_8php.html":[5,0,1,101], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,101,0], -"toggle__safesearch_8php.html":[5,0,1,102], -"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,102,0], +"thing_8php.html":[5,0,1,98], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,98,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,98,1], +"toggle__mobile_8php.html":[5,0,1,99], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,99,0], +"toggle__safesearch_8php.html":[5,0,1,100], +"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,100,0], "tpldebug_8php.html":[5,0,2,8], "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[5,0,2,8,0], "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[5,0,2,8,1], @@ -131,18 +128,18 @@ var NAVTREEINDEX7 = "typohelper_8php.html":[5,0,2,10], "typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,10,0], "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[5,0,2,10,1], -"uexport_8php.html":[5,0,1,103], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,103,0], -"update__channel_8php.html":[5,0,1,104], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,104,0], -"update__community_8php.html":[5,0,1,105], -"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,105,0], -"update__display_8php.html":[5,0,1,106], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,106,0], -"update__network_8php.html":[5,0,1,107], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,107,0], -"update__search_8php.html":[5,0,1,108], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,108,0], +"uexport_8php.html":[5,0,1,101], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,101,0], +"update__channel_8php.html":[5,0,1,102], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,102,0], +"update__community_8php.html":[5,0,1,103], +"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,103,0], +"update__display_8php.html":[5,0,1,104], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,104,0], +"update__network_8php.html":[5,0,1,105], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,105,0], +"update__search_8php.html":[5,0,1,106], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,106,0], "updatetpl_8py.html":[5,0,2,11], "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,11,5], "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,11,2], @@ -170,49 +167,54 @@ var NAVTREEINDEX7 = "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[5,0,3,1,2,0,0,0], "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,2,0,0,1], "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,2,0,0,2], -"view_8php.html":[5,0,1,109], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,109,0], -"viewconnections_8php.html":[5,0,1,110], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,110,1], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,110,0], -"viewsrc_8php.html":[5,0,1,111], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,111,0], -"vote_8php.html":[5,0,1,112], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,112,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,112,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,112,1], -"wall__attach_8php.html":[5,0,1,113], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,113,0], -"wall__upload_8php.html":[5,0,1,114], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,114,0], -"webfinger_8php.html":[5,0,1,115], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,115,0], -"webpages_8php.html":[5,0,1,116], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,116,0], -"wfinger_8php.html":[5,0,1,117], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,117,0], +"view_8php.html":[5,0,1,107], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,107,0], +"viewconnections_8php.html":[5,0,1,108], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,108,1], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,108,0], +"viewsrc_8php.html":[5,0,1,109], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,109,0], +"vote_8php.html":[5,0,1,110], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,110,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,110,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,110,1], +"wall__attach_8php.html":[5,0,1,111], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,111,0], +"wall__upload_8php.html":[5,0,1,112], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,112,0], +"webfinger_8php.html":[5,0,1,113], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,113,0], +"webpages_8php.html":[5,0,1,114], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,114,0], +"wfinger_8php.html":[5,0,1,115], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,115,0], "widedarkness_8php.html":[5,0,3,1,0,1,10], "widgets_8php.html":[5,0,0,70], -"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,70,11], -"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,70,8], +"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[5,0,0,70,15], +"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[5,0,0,70,4], +"widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256":[5,0,0,70,10], "widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0":[5,0,0,70,5], -"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,70,12], -"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,70,7], -"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,70,2], -"widgets_8php.html#a8e670642c7a957d2b5578dfb75aedc05":[5,0,0,70,0], -"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,70,10], -"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,70,4], -"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,70,9], -"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[5,0,0,70,6], -"widgets_8php.html#add9b24d3304e529a7975e96122315554":[5,0,0,70,1], -"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,70,13], -"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[5,0,0,70,3], -"xchan_8php.html":[5,0,1,118], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,118,0], -"xrd_8php.html":[5,0,1,119], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,119,0], -"zfinger_8php.html":[5,0,1,120], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,120,0], +"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,70,16], +"widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e":[5,0,0,70,11], +"widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165":[5,0,0,70,8], +"widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65":[5,0,0,70,1], +"widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8":[5,0,0,70,13], +"widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f":[5,0,0,70,3], +"widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[5,0,0,70,14], +"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,70,12], +"widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[5,0,0,70,18], +"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[5,0,0,70,7], +"widgets_8php.html#add9b24d3304e529a7975e96122315554":[5,0,0,70,0], +"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[5,0,0,70,6], +"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[5,0,0,70,17], +"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[5,0,0,70,2], +"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[5,0,0,70,9], +"xchan_8php.html":[5,0,1,116], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,116,0], +"xrd_8php.html":[5,0,1,117], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,117,0], +"zfinger_8php.html":[5,0,1,118], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,118,0], "zot_8php.html":[5,0,0,71], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,71,13], "zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,71,7], @@ -242,8 +244,8 @@ var NAVTREEINDEX7 = "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[5,0,0,71,20], "zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,71,22], "zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,71,6], -"zotfeed_8php.html":[5,0,1,121], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,121,0], -"zping_8php.html":[5,0,1,122], -"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,122,0] +"zotfeed_8php.html":[5,0,1,119], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,119,0], +"zping_8php.html":[5,0,1,120], +"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,120,0] }; diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index c9294e06c..ee986e74a 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -197,7 +197,7 @@ Functions
      Returns
      : array of all permissions, key is permission name, value is true or false
      -

      Referenced by blocks_content(), change_channel(), channel_content(), connections_content(), editblock_content(), editlayout_content(), editwebpage_content(), filestorage_content(), layouts_content(), page_content(), photos_init(), webpages_content(), and zfinger_init().

      +

      Referenced by blocks_content(), change_channel(), channel_content(), connedit_content(), editblock_content(), editlayout_content(), editwebpage_content(), filestorage_content(), layouts_content(), page_content(), webpages_content(), and zfinger_init().

      @@ -214,7 +214,7 @@ Functions
      @@ -248,7 +248,7 @@ Functions
      -

      Referenced by Conversation\add_thread(), advanced_profile(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedInode\delete(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_content(), profile_load(), profile_sidebar(), Conversation\set_mode(), RedInode\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), z_readdir(), and zot_feed().

      +

      Referenced by Conversation\add_thread(), advanced_profile(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), check_list_permissions(), common_content(), common_friends_visitor_widget(), RedInode\delete(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), process_delivery(), process_mail_delivery(), profile_content(), profile_load(), profile_sidebar(), Conversation\set_mode(), RedInode\setName(), subthread_content(), syncdirs(), tag_deliver(), tgroup_check(), viewconnections_content(), widget_photo_albums(), z_readdir(), and zot_feed().

      diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index c89fdac58..1b64b003a 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(), advanced_profile(), aes_encapsulate(), aes_unencapsulate(), build_sync_packet(), connections_content(), connections_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirsearch_content(), 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(), 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(), process_channel_sync_delivery(), requestdata(), App\set_widget(), settings_post(), startup(), syncdirs(), tt(), vote_post(), 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_post(), connedit_content(), connedit_post(), construct_page(), contact_poll_interval(), contact_reputation(), dirsearch_content(), 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(), 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(), process_channel_sync_delivery(), requestdata(), settings_post(), startup(), syncdirs(), tt(), vote_post(), x(), zfinger_init(), and zot_refresh().

      diff --git a/doc/html/php_2default_8php.html b/doc/html/php_2default_8php.html index 0ca6ea675..179210e2b 100644 --- a/doc/html/php_2default_8php.html +++ b/doc/html/php_2default_8php.html @@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('php_2default_8php.html','');}); - +

      Variables

       if (x($page,'htmlhead')) echo $page['htmlhead']?></head >< body ><?php if(x($page
       if (x($page,'htmlhead')) echo $page['htmlhead']?></head >< body ><?php if(x($page
       

      Variable Documentation

      @@ -121,7 +121,7 @@ Variables
      - +
      if(x($page,'htmlhead')) echo $page['htmlhead']?></head >< body ><?php if(x($pageif(x($page,'htmlhead')) echo $page['htmlhead']?></head >< body ><?php if(x($page
      diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 04ba0e59d..1741fff27 100644 --- a/doc/html/php_2theme__init_8php.html +++ b/doc/html/php_2theme__init_8php.html @@ -127,7 +127,7 @@ Variables

      Those who require this feature will know what to do with it. Those who don't, won't. Eventually this functionality needs to be provided by a module such that permissions can be enforced. At the moment it's more of a proof of concept; but sufficient for our immediate needs.

      -

      Referenced by api_call(), api_user(), attach_mkdir(), attach_store(), blocks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), connections_content(), connections_init(), connections_post(), conversation(), design_tools(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), feed_init(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), menu_add_item(), menu_edit_item(), message_content(), message_post(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), photo_upload(), photos_albums_list(), photos_content(), photos_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), post_to_red_post(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profiles_post(), rpost_content(), send_message(), settings_aside(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), zot_build_packet(), zot_finger(), and zot_refresh().

      +

      Referenced by api_call(), api_user(), attach_mkdir(), attach_store(), blocks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), feed_init(), fix_attached_file_permissions(), fix_system_urls(), get_feed_for(), get_public_feed(), home_init(), import_post(), invite_content(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), menu_add_item(), menu_edit_item(), message_content(), message_post(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), photo_upload(), photos_albums_list(), photos_content(), photos_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), post_to_red_post(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profiles_post(), rpost_content(), send_message(), settings_post(), sources_post(), tagger_content(), thing_init(), uexport_init(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().

      diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index ec97aaa58..cbdc0ae40 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -198,7 +198,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(), connect_content(), connections_content(), connections_post(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_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(), import_author_xchan(), import_directory_profile(), import_xchan(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), list_widgets(), login(), 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(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), post_activity_item(), post_init(), prepare_body(), proc_run(), profile_content(), profile_sidebar(), profiles_content(), profiles_post(), replace_macros(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), widget_affinity(), xrd_init(), zfinger_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(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_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(), home_content(), home_init(), html2bbcode(), import_author_xchan(), import_directory_profile(), import_xchan(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), login(), 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(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), post_activity_item(), post_init(), prepare_body(), proc_run(), profile_content(), profile_sidebar(), profiles_content(), profiles_post(), replace_macros(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), widget_affinity(), xrd_init(), zfinger_init(), zid(), and zid_init().

      @@ -290,7 +290,7 @@ Functions
      -

      Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), dir_safe_mode(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), settings_aside(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_archive(), widget_filer(), widget_follow(), widget_notes(), widget_savedsearch(), widget_suggestions(), writepages_widget(), and xrd_init().

      +

      Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), dir_safe_mode(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_archive(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().

      @@ -719,7 +719,7 @@ Functions diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 529ec0c2d..3bf81aaa0 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -108,6 +108,7 @@ var searchData= ['_24pmenu_5freply',['$pmenu_reply',['../redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c',1,'style.php']]], ['_24pmenu_5ftop',['$pmenu_top',['../redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158',1,'style.php']]], ['_24pofile',['$pofile',['../php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1',1,'php2po.php']]], + ['_24poi',['$poi',['../classApp.html#a1936f2afce0dc0d1bbed15ae1f2ee81a',1,'App']]], ['_24prepared_5fitem',['$prepared_item',['../classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2',1,'Conversation']]], ['_24preview',['$preview',['../classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae',1,'Conversation']]], ['_24profile',['$profile',['../classApp.html#a57d041fcc003d08c127dfa99a02bc192',1,'App']]], diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index e89337e96..d2fefe5fa 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -24,6 +24,7 @@ var searchData= ['account_5fremoved',['ACCOUNT_REMOVED',['../boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78',1,'boot.php']]], ['account_5frole_5fadmin',['ACCOUNT_ROLE_ADMIN',['../boot_8php.html#ac8400313df2c831653f9036f71ebd86d',1,'boot.php']]], ['account_5frole_5fallowcode',['ACCOUNT_ROLE_ALLOWCODE',['../boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688',1,'boot.php']]], + ['account_5frole_5fsystem',['ACCOUNT_ROLE_SYSTEM',['../boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b',1,'boot.php']]], ['account_5ftotal',['account_total',['../account_8php.html#a43e3042b2723d76915a030bac3c668b6',1,'account.php']]], ['account_5funverified',['ACCOUNT_UNVERIFIED',['../boot_8php.html#af3a4271630aabd8be592213f925d6a36',1,'boot.php']]], ['account_5fverify_5fpassword',['account_verify_password',['../auth_8php.html#a07bae0e623e2daa9ee2cd5a8aa294dee',1,'auth.php']]], @@ -86,8 +87,6 @@ var searchData= ['aes_5funencapsulate',['aes_unencapsulate',['../crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914',1,'crypto.php']]], ['age',['age',['../datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df',1,'datetime.php']]], ['all_5ffriends',['all_friends',['../socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586',1,'socgraph.php']]], - ['allfriends_2ephp',['allfriends.php',['../allfriends_8php.html',1,'']]], - ['allfriends_5fcontent',['allfriends_content',['../allfriends_8php.html#aad992ddbb5f20e81c5cf2259718aec83',1,'allfriends.php']]], ['allowed_5femail',['allowed_email',['../include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694',1,'network.php']]], ['allowed_5fpublic_5frecips',['allowed_public_recips',['../zot_8php.html#a703f528ade8382cf374e4119bd6f7859',1,'zot.php']]], ['allowed_5furl',['allowed_url',['../include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7',1,'network.php']]], @@ -159,8 +158,8 @@ var searchData= ['atom_5fauthor',['atom_author',['../items_8php.html#a016dd86c827d08db89061ea81d15c6cb',1,'items.php']]], ['atom_5fentry',['atom_entry',['../items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6',1,'items.php']]], ['atom_5ftime',['ATOM_TIME',['../boot_8php.html#ad34c1547020a305915bcc39707744690',1,'boot.php']]], - ['attach_2ephp',['attach.php',['../include_2attach_8php.html',1,'']]], ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], + ['attach_2ephp',['attach.php',['../include_2attach_8php.html',1,'']]], ['attach_5fby_5fhash',['attach_by_hash',['../include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36',1,'attach.php']]], ['attach_5fby_5fhash_5fnodata',['attach_by_hash_nodata',['../include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932',1,'attach.php']]], ['attach_5fcount_5ffiles',['attach_count_files',['../include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3',1,'attach.php']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 9f968e083..45994dfef 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -11,8 +11,8 @@ var searchData= ['chanlink_5fcid',['chanlink_cid',['../text_8php.html#a85e3a4851c16674834010d8419a5d7ca',1,'text.php']]], ['chanlink_5fhash',['chanlink_hash',['../text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0',1,'text.php']]], ['chanlink_5furl',['chanlink_url',['../text_8php.html#a2e8d6c402603be3a1256a16605e09c2a',1,'text.php']]], - ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]], ['chanman_2ephp',['chanman.php',['../include_2chanman_8php.html',1,'']]], + ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]], ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]], ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]], ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]], @@ -93,11 +93,15 @@ var searchData= ['connect_5finit',['connect_init',['../connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36',1,'connect.php']]], ['connect_5fpost',['connect_post',['../connect_8php.html#a417ec27afe33f21a929667a665e32ee2',1,'connect.php']]], ['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]], - ['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]], ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]], ['connections_5fcontent',['connections_content',['../connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c',1,'connections.php']]], ['connections_5finit',['connections_init',['../connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558',1,'connections.php']]], ['connections_5fpost',['connections_post',['../connections_8php.html#a1224058db8e3fb56463eb312f98e561d',1,'connections.php']]], + ['connedit_2ephp',['connedit.php',['../connedit_8php.html',1,'']]], + ['connedit_5fclone',['connedit_clone',['../connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5',1,'connedit.php']]], + ['connedit_5fcontent',['connedit_content',['../connedit_8php.html#a795acb3d9d841f55c255d7611681ab67',1,'connedit.php']]], + ['connedit_5finit',['connedit_init',['../connedit_8php.html#a4da871e075597a09a8b374b9171dd92e',1,'connedit.php']]], + ['connedit_5fpost',['connedit_post',['../connedit_8php.html#a234c48426b652bf4d37053f2af329ac5',1,'connedit.php']]], ['construct_5factivity_5fobject',['construct_activity_object',['../items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee',1,'items.php']]], ['construct_5factivity_5ftarget',['construct_activity_target',['../items_8php.html#aa579bc4445d60098b1410961ca8e96b7',1,'items.php']]], ['construct_5fpage',['construct_page',['../boot_8php.html#acc4e0c910af066148b810e5fde55fff1',1,'boot.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index acc803194..95b549ff9 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -29,6 +29,7 @@ var searchData= ['get_5fdata',['get_data',['../classItem.html#ad3638f93065693c1f69eb349feb1b7aa',1,'Item']]], ['get_5fdata_5fvalue',['get_data_value',['../classItem.html#ac6f1c96cc82a0dfb7e881fc70309ea3c',1,'Item']]], ['get_5fdb_5ferrno',['get_db_errno',['../setup_8php.html#a8652788e8589778c5f81634a9d5b9429',1,'setup.php']]], + ['get_5fdefault_5fprofile_5fphoto',['get_default_profile_photo',['../identity_8php.html#ab1485a26b032956e1496fc08c58b83ed',1,'identity.php']]], ['get_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], ['get_5fevents',['get_events',['../identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'identity.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], @@ -102,11 +103,10 @@ var searchData= ['gravity_5flike',['GRAVITY_LIKE',['../boot_8php.html#a1f5906598e90b5ea2b4245f682be4348',1,'boot.php']]], ['gravity_5fparent',['GRAVITY_PARENT',['../boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3',1,'boot.php']]], ['greenthumbnails_2ephp',['greenthumbnails.php',['../greenthumbnails_8php.html',1,'']]], - ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]], ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]], + ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]], ['group_5fadd',['group_add',['../include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce',1,'group.php']]], ['group_5fadd_5fmember',['group_add_member',['../include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b',1,'group.php']]], - ['group_5faside',['group_aside',['../mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c',1,'group.php']]], ['group_5fbyname',['group_byname',['../include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb',1,'group.php']]], ['group_5fcontent',['group_content',['../mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83',1,'group.php']]], ['group_5fget_5fmembers',['group_get_members',['../include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09',1,'group.php']]], @@ -115,7 +115,7 @@ var searchData= ['group_5frmv',['group_rmv',['../include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5',1,'group.php']]], ['group_5frmv_5fmember',['group_rmv_member',['../include_2group_8php.html#a540e3ef36f47d47532646be4241f6518',1,'group.php']]], ['group_5fselect',['group_select',['../acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0',1,'acl_selectors.php']]], - ['group_5fside',['group_side',['../include_2group_8php.html#abdfce3fd8dcf0c46543d190d0530b4a2',1,'group.php']]], + ['group_5fside',['group_side',['../include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9',1,'group.php']]], ['groups_5fcontaining',['groups_containing',['../include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f',1,'group.php']]], ['guess_5fimage_5ftype',['guess_image_type',['../photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa',1,'photo_driver.php']]] ]; diff --git a/doc/html/search/all_68.js b/doc/html/search/all_68.js index 6aa164847..e9d7e3976 100644 --- a/doc/html/search/all_68.js +++ b/doc/html/search/all_68.js @@ -14,6 +14,8 @@ var searchData= ['help_2ephp',['help.php',['../help_8php.html',1,'']]], ['help_5fcontent',['help_content',['../help_8php.html#af055e15f600ffa6fbca9386fdf715224',1,'help.php']]], ['home_2ephp',['home.php',['../home_8php.html',1,'']]], + ['home_5fcontent',['home_content',['../home_8php.html#aa1cf697851a646755baf537f75334c46',1,'home.php']]], + ['home_5finit',['home_init',['../home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde',1,'home.php']]], ['hostxrd_2ephp',['hostxrd.php',['../hostxrd_8php.html',1,'']]], ['hostxrd_5finit',['hostxrd_init',['../hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92',1,'hostxrd.php']]], ['html2bb_5fvideo',['html2bb_video',['../text_8php.html#a138a3a611fa7f4f3630674145fc826bf',1,'text.php']]], diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js index c256f5457..1760a1eca 100644 --- a/doc/html/search/all_6c.js +++ b/doc/html/search/all_6c.js @@ -16,7 +16,6 @@ var searchData= ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]], ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]], ['list_5fpublic_5fsites',['list_public_sites',['../dirsearch_8php.html#a985d410a170549429857af6ff2673149',1,'dirsearch.php']]], - ['list_5fwidgets',['list_widgets',['../widgets_8php.html#a8e670642c7a957d2b5578dfb75aedc05',1,'widgets.php']]], ['load',['load',['../classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712',1,'photo_driver\load()'],['../classphoto__gd.html#a33092b889875b68bfb1c97ff123012d9',1,'photo_gd\load()'],['../classphoto__imagick.html#a2c9168f110ccd6c264095d766615dfa8',1,'photo_imagick\load()']]], ['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]], ['load_5fcontact_5flinks',['load_contact_links',['../boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6',1,'boot.php']]], diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js index 44c214360..006d47f5f 100644 --- a/doc/html/search/all_6d.js +++ b/doc/html/search/all_6d.js @@ -40,7 +40,6 @@ var searchData= ['menu_5frender',['menu_render',['../include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e',1,'menu.php']]], ['message_2ephp',['message.php',['../mod_2message_8php.html',1,'']]], ['message_2ephp',['message.php',['../include_2message_8php.html',1,'']]], - ['message_5faside',['message_aside',['../mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7',1,'message.php']]], ['message_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]], ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], @@ -53,8 +52,6 @@ var searchData= ['mitem_5finit',['mitem_init',['../mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518',1,'mitem.php']]], ['mitem_5fpost',['mitem_post',['../mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1',1,'mitem.php']]], ['mod_5fimport_2ephp',['mod_import.php',['../mod__import_8php.html',1,'']]], - ['mod_5fnew_5fchannel_2ephp',['mod_new_channel.php',['../mod__new__channel_8php.html',1,'']]], - ['mod_5fregister_2ephp',['mod_register.php',['../mod__register_8php.html',1,'']]], ['mood_2ephp',['mood.php',['../mood_8php.html',1,'']]], ['mood_5fcontent',['mood_content',['../mood_8php.html#a721b9b6703b3234a005641c92d409b8f',1,'mood.php']]], ['mood_5finit',['mood_init',['../mood_8php.html#a7ae136dd7476865b4828136175db5022',1,'mood.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 36a75ee55..68df90d15 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -1,6 +1,6 @@ var searchData= [ - ['page',['page',['../mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_import.php'],['../mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_new_channel.php'],['../mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_register.php']]], + ['page',['page',['../mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'mod_import.php']]], ['page_2ephp',['page.php',['../page_8php.html',1,'']]], ['page_5fadult',['PAGE_ADULT',['../boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32',1,'boot.php']]], ['page_5fapplication',['PAGE_APPLICATION',['../boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed',1,'boot.php']]], @@ -12,6 +12,7 @@ var searchData= ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], ['page_5fpremium',['PAGE_PREMIUM',['../boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8',1,'boot.php']]], ['page_5fremoved',['PAGE_REMOVED',['../boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6',1,'boot.php']]], + ['page_5fsystem',['PAGE_SYSTEM',['../boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932',1,'boot.php']]], ['page_5fwidgets_2ephp',['page_widgets.php',['../page__widgets_8php.html',1,'']]], ['pagelist_5fwidget',['pagelist_widget',['../page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0',1,'page_widgets.php']]], ['paginate',['paginate',['../text_8php.html#afe9f178d264d44a94dc1292aaf0fd585',1,'text.php']]], diff --git a/doc/html/search/all_71.js b/doc/html/search/all_71.js index 9a1ee9bc1..c1c1f6ba7 100644 --- a/doc/html/search/all_71.js +++ b/doc/html/search/all_71.js @@ -2,8 +2,6 @@ var searchData= [ ['q',['q',['../classdba__driver.html#a558e738b88ae893cc5d79ffa3793d555',1,'dba_driver\q()'],['../classdba__mysql.html#ac3fd60c278f400907322dac578754a99',1,'dba_mysql\q()'],['../classdba__mysqli.html#a611c4de8d6d7512dffb83a38bb6701ec',1,'dba_mysqli\q()'],['../dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f',1,'q(): dba_driver.php']]], ['qp',['qp',['../text_8php.html#afc998d2796a6b2a08e96f7cc061e7221',1,'text.php']]], - ['qsearch_2ephp',['qsearch.php',['../qsearch_8php.html',1,'']]], - ['qsearch_5finit',['qsearch_init',['../qsearch_8php.html#a0501887b95bd8fa21018b2936a668894',1,'qsearch.php']]], ['queue_2ephp',['queue.php',['../queue_8php.html',1,'']]], ['queue_5ffn_2ephp',['queue_fn.php',['../queue__fn_8php.html',1,'']]], ['queue_5frun',['queue_run',['../queue_8php.html#af8c93de86d866c3200174c8450a0f341',1,'queue.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 356f98561..692fa4835 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -24,8 +24,6 @@ var searchData= ['reddirectory',['RedDirectory',['../classRedDirectory.html',1,'']]], ['redfile',['RedFile',['../classRedFile.html',1,'']]], ['redinode',['RedInode',['../classRedInode.html',1,'']]], - ['redir_2ephp',['redir.php',['../redir_8php.html',1,'']]], - ['redir_5finit',['redir_init',['../redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5',1,'redir.php']]], ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]], ['ref_5fsession_5fclose',['ref_session_close',['../session_8php.html#a5e1c616e02b863d5450317d101366bb7',1,'session.php']]], ['ref_5fsession_5fdestroy',['ref_session_destroy',['../session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052',1,'session.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 62b0494ae..991e65ddf 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -54,7 +54,6 @@ var searchData= ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]], ['setname',['setName',['../classRedInode.html#a3d76322f25d847b123b3df37a26dd04e',1,'RedInode']]], ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]], - ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]], ['settings_5finit',['settings_init',['../settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]], ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]], ['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]], @@ -105,7 +104,6 @@ var searchData= ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]], - ['suggest_5faside',['suggest_aside',['../suggest_8php.html#a4df91c84594d51ba56b5918de414230d',1,'suggest.php']]], ['suggest_5fcontent',['suggest_content',['../suggest_8php.html#a58748a8235d4523f8333847f3e42dd91',1,'suggest.php']]], ['suggest_5finit',['suggest_init',['../suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c',1,'suggest.php']]], ['suggestion_5fquery',['suggestion_query',['../socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329',1,'socgraph.php']]], diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js index 662ebcb04..878d539c3 100644 --- a/doc/html/search/all_77.js +++ b/doc/html/search/all_77.js @@ -19,15 +19,21 @@ var searchData= ['widget_5farchive',['widget_archive',['../widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65',1,'widgets.php']]], ['widget_5fcategories',['widget_categories',['../widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b',1,'widgets.php']]], ['widget_5fcollections',['widget_collections',['../widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f',1,'widgets.php']]], + ['widget_5fdesign_5ftools',['widget_design_tools',['../widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b',1,'widgets.php']]], ['widget_5ffiler',['widget_filer',['../widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0',1,'widgets.php']]], + ['widget_5ffindpeople',['widget_findpeople',['../widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2',1,'widgets.php']]], ['widget_5ffollow',['widget_follow',['../widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd',1,'widgets.php']]], ['widget_5ffullprofile',['widget_fullprofile',['../widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165',1,'widgets.php']]], + ['widget_5fmailmenu',['widget_mailmenu',['../widgets_8php.html#afa2e55a78f95667a6da082efac7fec74',1,'widgets.php']]], ['widget_5fnotes',['widget_notes',['../widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256',1,'widgets.php']]], + ['widget_5fphoto_5falbums',['widget_photo_albums',['../widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e',1,'widgets.php']]], ['widget_5fprofile',['widget_profile',['../widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'widgets.php']]], ['widget_5fsavedsearch',['widget_savedsearch',['../widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8',1,'widgets.php']]], + ['widget_5fsettings_5fmenu',['widget_settings_menu',['../widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01',1,'widgets.php']]], ['widget_5fsuggestions',['widget_suggestions',['../widgets_8php.html#a0d404276fedc59f5038cf5c085028326',1,'widgets.php']]], ['widget_5ftagcloud',['widget_tagcloud',['../widgets_8php.html#a6dbc227aac750774284ee39c45f0a200',1,'widgets.php']]], ['widget_5ftagcloud_5fwall',['widget_tagcloud_wall',['../widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653',1,'widgets.php']]], + ['widget_5fvcard',['widget_vcard',['../widgets_8php.html#abe03366fd22fd27d683518fa0765da50',1,'widgets.php']]], ['widgets_2ephp',['widgets.php',['../widgets_8php.html',1,'']]], ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]] ]; diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js index b001e9752..df22b5cc7 100644 --- a/doc/html/search/all_78.js +++ b/doc/html/search/all_78.js @@ -8,6 +8,7 @@ var searchData= ['xchan_5fflags_5fhidden',['XCHAN_FLAGS_HIDDEN',['../boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2',1,'boot.php']]], ['xchan_5fflags_5forphan',['XCHAN_FLAGS_ORPHAN',['../boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f',1,'boot.php']]], ['xchan_5fflags_5fselfcensored',['XCHAN_FLAGS_SELFCENSORED',['../boot_8php.html#a5a681a672e007cdc22b43345d71f07c6',1,'boot.php']]], + ['xchan_5fflags_5fsystem',['XCHAN_FLAGS_SYSTEM',['../boot_8php.html#afef254290febac854c85fc698d9483a6',1,'boot.php']]], ['xchan_5fmail_5fquery',['xchan_mail_query',['../text_8php.html#a543447c5ed766535221e2d9636b379ee',1,'text.php']]], ['xchan_5fquery',['xchan_query',['../text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f',1,'text.php']]], ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]], diff --git a/doc/html/search/files_61.js b/doc/html/search/files_61.js index 6ad1b427b..a4965f4fa 100644 --- a/doc/html/search/files_61.js +++ b/doc/html/search/files_61.js @@ -5,11 +5,10 @@ var searchData= ['acl_5fselectors_2ephp',['acl_selectors.php',['../acl__selectors_8php.html',1,'']]], ['activities_2ephp',['activities.php',['../activities_8php.html',1,'']]], ['admin_2ephp',['admin.php',['../admin_8php.html',1,'']]], - ['allfriends_2ephp',['allfriends.php',['../allfriends_8php.html',1,'']]], - ['api_2ephp',['api.php',['../mod_2api_8php.html',1,'']]], ['api_2ephp',['api.php',['../include_2api_8php.html',1,'']]], + ['api_2ephp',['api.php',['../mod_2api_8php.html',1,'']]], ['apps_2ephp',['apps.php',['../apps_8php.html',1,'']]], - ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], ['attach_2ephp',['attach.php',['../include_2attach_8php.html',1,'']]], + ['attach_2ephp',['attach.php',['../mod_2attach_8php.html',1,'']]], ['auth_2ephp',['auth.php',['../auth_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js index 3608cf3e6..ab4e4cdd3 100644 --- a/doc/html/search/files_63.js +++ b/doc/html/search/files_63.js @@ -19,6 +19,7 @@ var searchData= ['config_2ephp',['config.php',['../view_2theme_2blogga_2php_2config_8php.html',1,'']]], ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]], ['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]], + ['connedit_2ephp',['connedit.php',['../connedit_8php.html',1,'']]], ['contact_2ephp',['Contact.php',['../Contact_8php.html',1,'']]], ['contact_5fselectors_2ephp',['contact_selectors.php',['../contact__selectors_8php.html',1,'']]], ['contact_5fwidgets_2ephp',['contact_widgets.php',['../contact__widgets_8php.html',1,'']]], diff --git a/doc/html/search/files_6d.js b/doc/html/search/files_6d.js index 25d3ea66a..bd759d5c7 100644 --- a/doc/html/search/files_6d.js +++ b/doc/html/search/files_6d.js @@ -11,8 +11,6 @@ var searchData= ['minimalisticdarkness_2ephp',['minimalisticdarkness.php',['../minimalisticdarkness_8php.html',1,'']]], ['mitem_2ephp',['mitem.php',['../mitem_8php.html',1,'']]], ['mod_5fimport_2ephp',['mod_import.php',['../mod__import_8php.html',1,'']]], - ['mod_5fnew_5fchannel_2ephp',['mod_new_channel.php',['../mod__new__channel_8php.html',1,'']]], - ['mod_5fregister_2ephp',['mod_register.php',['../mod__register_8php.html',1,'']]], ['mood_2ephp',['mood.php',['../mood_8php.html',1,'']]], ['msearch_2ephp',['msearch.php',['../msearch_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_71.js b/doc/html/search/files_71.js index 1da0b5b3f..6a4d7ec81 100644 --- a/doc/html/search/files_71.js +++ b/doc/html/search/files_71.js @@ -1,6 +1,5 @@ var searchData= [ - ['qsearch_2ephp',['qsearch.php',['../qsearch_8php.html',1,'']]], ['queue_2ephp',['queue.php',['../queue_8php.html',1,'']]], ['queue_5ffn_2ephp',['queue_fn.php',['../queue__fn_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_72.js b/doc/html/search/files_72.js index 00e4c63ae..e6734d438 100644 --- a/doc/html/search/files_72.js +++ b/doc/html/search/files_72.js @@ -5,7 +5,6 @@ var searchData= ['readme_2emd',['README.md',['../blogga_2php_2README_8md.html',1,'']]], ['redbasic_2ephp',['redbasic.php',['../redbasic_8php.html',1,'']]], ['reddav_2ephp',['reddav.php',['../reddav_8php.html',1,'']]], - ['redir_2ephp',['redir.php',['../redir_8php.html',1,'']]], ['register_2ephp',['register.php',['../register_8php.html',1,'']]], ['regmod_2ephp',['regmod.php',['../regmod_8php.html',1,'']]], ['removeme_2ephp',['removeme.php',['../removeme_8php.html',1,'']]], diff --git a/doc/html/search/functions_61.js b/doc/html/search/functions_61.js index 6a1b52ef3..2d15fcf49 100644 --- a/doc/html/search/functions_61.js +++ b/doc/html/search/functions_61.js @@ -35,7 +35,6 @@ var searchData= ['aes_5funencapsulate',['aes_unencapsulate',['../crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914',1,'crypto.php']]], ['age',['age',['../datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df',1,'datetime.php']]], ['all_5ffriends',['all_friends',['../socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586',1,'socgraph.php']]], - ['allfriends_5fcontent',['allfriends_content',['../allfriends_8php.html#aad992ddbb5f20e81c5cf2259718aec83',1,'allfriends.php']]], ['allowed_5femail',['allowed_email',['../include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694',1,'network.php']]], ['allowed_5fpublic_5frecips',['allowed_public_recips',['../zot_8php.html#a703f528ade8382cf374e4119bd6f7859',1,'zot.php']]], ['allowed_5furl',['allowed_url',['../include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7',1,'network.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 1a00e2f8a..d2dc663de 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -70,11 +70,14 @@ var searchData= ['connect_5fcontent',['connect_content',['../connect_8php.html#a489f0a66c660de6ec4d6917b27674f07',1,'connect.php']]], ['connect_5finit',['connect_init',['../connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36',1,'connect.php']]], ['connect_5fpost',['connect_post',['../connect_8php.html#a417ec27afe33f21a929667a665e32ee2',1,'connect.php']]], - ['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]], ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]], ['connections_5fcontent',['connections_content',['../connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c',1,'connections.php']]], ['connections_5finit',['connections_init',['../connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558',1,'connections.php']]], ['connections_5fpost',['connections_post',['../connections_8php.html#a1224058db8e3fb56463eb312f98e561d',1,'connections.php']]], + ['connedit_5fclone',['connedit_clone',['../connedit_8php.html#a707ea7e63cf9674025b1d6b081ae74f5',1,'connedit.php']]], + ['connedit_5fcontent',['connedit_content',['../connedit_8php.html#a795acb3d9d841f55c255d7611681ab67',1,'connedit.php']]], + ['connedit_5finit',['connedit_init',['../connedit_8php.html#a4da871e075597a09a8b374b9171dd92e',1,'connedit.php']]], + ['connedit_5fpost',['connedit_post',['../connedit_8php.html#a234c48426b652bf4d37053f2af329ac5',1,'connedit.php']]], ['construct_5factivity_5fobject',['construct_activity_object',['../items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee',1,'items.php']]], ['construct_5factivity_5ftarget',['construct_activity_target',['../items_8php.html#aa579bc4445d60098b1410961ca8e96b7',1,'items.php']]], ['construct_5fpage',['construct_page',['../boot_8php.html#acc4e0c910af066148b810e5fde55fff1',1,'boot.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index ed30eaa80..6c1855b87 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -29,6 +29,7 @@ var searchData= ['get_5fdata',['get_data',['../classItem.html#ad3638f93065693c1f69eb349feb1b7aa',1,'Item']]], ['get_5fdata_5fvalue',['get_data_value',['../classItem.html#ac6f1c96cc82a0dfb7e881fc70309ea3c',1,'Item']]], ['get_5fdb_5ferrno',['get_db_errno',['../setup_8php.html#a8652788e8589778c5f81634a9d5b9429',1,'setup.php']]], + ['get_5fdefault_5fprofile_5fphoto',['get_default_profile_photo',['../identity_8php.html#ab1485a26b032956e1496fc08c58b83ed',1,'identity.php']]], ['get_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], ['get_5fevents',['get_events',['../identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'identity.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], @@ -99,7 +100,6 @@ var searchData= ['gprobe_5frun',['gprobe_run',['../gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1',1,'gprobe.php']]], ['group_5fadd',['group_add',['../include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce',1,'group.php']]], ['group_5fadd_5fmember',['group_add_member',['../include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b',1,'group.php']]], - ['group_5faside',['group_aside',['../mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c',1,'group.php']]], ['group_5fbyname',['group_byname',['../include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb',1,'group.php']]], ['group_5fcontent',['group_content',['../mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83',1,'group.php']]], ['group_5fget_5fmembers',['group_get_members',['../include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09',1,'group.php']]], @@ -108,7 +108,7 @@ var searchData= ['group_5frmv',['group_rmv',['../include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5',1,'group.php']]], ['group_5frmv_5fmember',['group_rmv_member',['../include_2group_8php.html#a540e3ef36f47d47532646be4241f6518',1,'group.php']]], ['group_5fselect',['group_select',['../acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0',1,'acl_selectors.php']]], - ['group_5fside',['group_side',['../include_2group_8php.html#abdfce3fd8dcf0c46543d190d0530b4a2',1,'group.php']]], + ['group_5fside',['group_side',['../include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9',1,'group.php']]], ['groups_5fcontaining',['groups_containing',['../include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f',1,'group.php']]], ['guess_5fimage_5ftype',['guess_image_type',['../photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa',1,'photo_driver.php']]] ]; diff --git a/doc/html/search/functions_68.js b/doc/html/search/functions_68.js index b923ff905..6d085bdc8 100644 --- a/doc/html/search/functions_68.js +++ b/doc/html/search/functions_68.js @@ -12,6 +12,8 @@ var searchData= ['head_5fset_5ficon',['head_set_icon',['../classApp.html#a8863703a0305eaa45eb970dbd2046291',1,'App\head_set_icon()'],['../boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84',1,'head_set_icon(): boot.php']]], ['help',['help',['../namespacefriendica-to-smarty-tpl.html#af6b2c793958aae2aadc294577431f749',1,'friendica-to-smarty-tpl.help()'],['../namespaceupdatetpl.html#ac9d11279fed403a329a719298feafc4f',1,'updatetpl.help()']]], ['help_5fcontent',['help_content',['../help_8php.html#af055e15f600ffa6fbca9386fdf715224',1,'help.php']]], + ['home_5fcontent',['home_content',['../home_8php.html#aa1cf697851a646755baf537f75334c46',1,'home.php']]], + ['home_5finit',['home_init',['../home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde',1,'home.php']]], ['hostxrd_5finit',['hostxrd_init',['../hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92',1,'hostxrd.php']]], ['html2bb_5fvideo',['html2bb_video',['../text_8php.html#a138a3a611fa7f4f3630674145fc826bf',1,'text.php']]], ['html2bbcode',['html2bbcode',['../html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837',1,'html2bbcode.php']]], diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js index b88f51b9d..0353cfc34 100644 --- a/doc/html/search/functions_6c.js +++ b/doc/html/search/functions_6c.js @@ -10,7 +10,6 @@ var searchData= ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]], ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]], ['list_5fpublic_5fsites',['list_public_sites',['../dirsearch_8php.html#a985d410a170549429857af6ff2673149',1,'dirsearch.php']]], - ['list_5fwidgets',['list_widgets',['../widgets_8php.html#a8e670642c7a957d2b5578dfb75aedc05',1,'widgets.php']]], ['load',['load',['../classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712',1,'photo_driver\load()'],['../classphoto__gd.html#a33092b889875b68bfb1c97ff123012d9',1,'photo_gd\load()'],['../classphoto__imagick.html#a2c9168f110ccd6c264095d766615dfa8',1,'photo_imagick\load()']]], ['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]], ['load_5fcontact_5flinks',['load_contact_links',['../boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6',1,'boot.php']]], diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js index c43f6598b..faa0fc13d 100644 --- a/doc/html/search/functions_6d.js +++ b/doc/html/search/functions_6d.js @@ -23,7 +23,6 @@ var searchData= ['menu_5flist',['menu_list',['../include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b',1,'menu.php']]], ['menu_5fpost',['menu_post',['../mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393',1,'menu.php']]], ['menu_5frender',['menu_render',['../include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e',1,'menu.php']]], - ['message_5faside',['message_aside',['../mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7',1,'message.php']]], ['message_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]], ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], diff --git a/doc/html/search/functions_71.js b/doc/html/search/functions_71.js index 64b6af3a9..11b357b31 100644 --- a/doc/html/search/functions_71.js +++ b/doc/html/search/functions_71.js @@ -2,7 +2,6 @@ var searchData= [ ['q',['q',['../classdba__driver.html#a558e738b88ae893cc5d79ffa3793d555',1,'dba_driver\q()'],['../classdba__mysql.html#ac3fd60c278f400907322dac578754a99',1,'dba_mysql\q()'],['../classdba__mysqli.html#a611c4de8d6d7512dffb83a38bb6701ec',1,'dba_mysqli\q()'],['../dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f',1,'q(): dba_driver.php']]], ['qp',['qp',['../text_8php.html#afc998d2796a6b2a08e96f7cc061e7221',1,'text.php']]], - ['qsearch_5finit',['qsearch_init',['../qsearch_8php.html#a0501887b95bd8fa21018b2936a668894',1,'qsearch.php']]], ['queue_5frun',['queue_run',['../queue_8php.html#af8c93de86d866c3200174c8450a0f341',1,'queue.php']]], ['quotelevel',['quotelevel',['../html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0',1,'html2plain.php']]] ]; diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index e00c170d9..79de86bff 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -10,7 +10,6 @@ var searchData= ['red_5fzrl_5fcallback',['red_zrl_callback',['../items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b',1,'items.php']]], ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793',1,'config.php']]], ['redbasic_5finit',['redbasic_init',['../redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]], - ['redir_5finit',['redir_init',['../redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5',1,'redir.php']]], ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]], ['ref_5fsession_5fclose',['ref_session_close',['../session_8php.html#a5e1c616e02b863d5450317d101366bb7',1,'session.php']]], ['ref_5fsession_5fdestroy',['ref_session_destroy',['../session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052',1,'session.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 4e80eec4f..835d6049c 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -49,7 +49,6 @@ var searchData= ['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]], ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]], ['setname',['setName',['../classRedInode.html#a3d76322f25d847b123b3df37a26dd04e',1,'RedInode']]], - ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]], ['settings_5finit',['settings_init',['../settings_8php.html#a3a4cde287482fced008583f54ba2a722',1,'settings.php']]], ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]], ['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]], @@ -84,7 +83,6 @@ var searchData= ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]], ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], - ['suggest_5faside',['suggest_aside',['../suggest_8php.html#a4df91c84594d51ba56b5918de414230d',1,'suggest.php']]], ['suggest_5fcontent',['suggest_content',['../suggest_8php.html#a58748a8235d4523f8333847f3e42dd91',1,'suggest.php']]], ['suggest_5finit',['suggest_init',['../suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c',1,'suggest.php']]], ['suggestion_5fquery',['suggestion_query',['../socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329',1,'socgraph.php']]], diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js index e03b445eb..5937176b6 100644 --- a/doc/html/search/functions_77.js +++ b/doc/html/search/functions_77.js @@ -12,14 +12,20 @@ var searchData= ['widget_5farchive',['widget_archive',['../widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65',1,'widgets.php']]], ['widget_5fcategories',['widget_categories',['../widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b',1,'widgets.php']]], ['widget_5fcollections',['widget_collections',['../widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f',1,'widgets.php']]], + ['widget_5fdesign_5ftools',['widget_design_tools',['../widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b',1,'widgets.php']]], ['widget_5ffiler',['widget_filer',['../widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0',1,'widgets.php']]], + ['widget_5ffindpeople',['widget_findpeople',['../widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2',1,'widgets.php']]], ['widget_5ffollow',['widget_follow',['../widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd',1,'widgets.php']]], ['widget_5ffullprofile',['widget_fullprofile',['../widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165',1,'widgets.php']]], + ['widget_5fmailmenu',['widget_mailmenu',['../widgets_8php.html#afa2e55a78f95667a6da082efac7fec74',1,'widgets.php']]], ['widget_5fnotes',['widget_notes',['../widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256',1,'widgets.php']]], + ['widget_5fphoto_5falbums',['widget_photo_albums',['../widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e',1,'widgets.php']]], ['widget_5fprofile',['widget_profile',['../widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'widgets.php']]], ['widget_5fsavedsearch',['widget_savedsearch',['../widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8',1,'widgets.php']]], + ['widget_5fsettings_5fmenu',['widget_settings_menu',['../widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01',1,'widgets.php']]], ['widget_5fsuggestions',['widget_suggestions',['../widgets_8php.html#a0d404276fedc59f5038cf5c085028326',1,'widgets.php']]], ['widget_5ftagcloud',['widget_tagcloud',['../widgets_8php.html#a6dbc227aac750774284ee39c45f0a200',1,'widgets.php']]], ['widget_5ftagcloud_5fwall',['widget_tagcloud_wall',['../widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653',1,'widgets.php']]], + ['widget_5fvcard',['widget_vcard',['../widgets_8php.html#abe03366fd22fd27d683518fa0765da50',1,'widgets.php']]], ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]] ]; diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 529ec0c2d..3bf81aaa0 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -108,6 +108,7 @@ var searchData= ['_24pmenu_5freply',['$pmenu_reply',['../redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c',1,'style.php']]], ['_24pmenu_5ftop',['$pmenu_top',['../redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158',1,'style.php']]], ['_24pofile',['$pofile',['../php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1',1,'php2po.php']]], + ['_24poi',['$poi',['../classApp.html#a1936f2afce0dc0d1bbed15ae1f2ee81a',1,'App']]], ['_24prepared_5fitem',['$prepared_item',['../classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2',1,'Conversation']]], ['_24preview',['$preview',['../classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae',1,'Conversation']]], ['_24profile',['$profile',['../classApp.html#a57d041fcc003d08c127dfa99a02bc192',1,'App']]], diff --git a/doc/html/search/variables_61.js b/doc/html/search/variables_61.js index 04c1a72d8..b5537bddf 100644 --- a/doc/html/search/variables_61.js +++ b/doc/html/search/variables_61.js @@ -18,6 +18,7 @@ var searchData= ['account_5fremoved',['ACCOUNT_REMOVED',['../boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78',1,'boot.php']]], ['account_5frole_5fadmin',['ACCOUNT_ROLE_ADMIN',['../boot_8php.html#ac8400313df2c831653f9036f71ebd86d',1,'boot.php']]], ['account_5frole_5fallowcode',['ACCOUNT_ROLE_ALLOWCODE',['../boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688',1,'boot.php']]], + ['account_5frole_5fsystem',['ACCOUNT_ROLE_SYSTEM',['../boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b',1,'boot.php']]], ['account_5funverified',['ACCOUNT_UNVERIFIED',['../boot_8php.html#af3a4271630aabd8be592213f925d6a36',1,'boot.php']]], ['activity_5fdislike',['ACTIVITY_DISLIKE',['../boot_8php.html#a0e57f846e6d47a308feced0f7274f178',1,'boot.php']]], ['activity_5ffavorite',['ACTIVITY_FAVORITE',['../boot_8php.html#a3e2ea123d29a72012db1241f96280b0e',1,'boot.php']]], diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js index 333736820..6fe926c34 100644 --- a/doc/html/search/variables_70.js +++ b/doc/html/search/variables_70.js @@ -1,6 +1,6 @@ var searchData= [ - ['page',['page',['../mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_import.php'],['../mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_new_channel.php'],['../mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'page(): mod_register.php']]], + ['page',['page',['../mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb',1,'mod_import.php']]], ['page_5fadult',['PAGE_ADULT',['../boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32',1,'boot.php']]], ['page_5fapplication',['PAGE_APPLICATION',['../boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed',1,'boot.php']]], ['page_5fautoconnect',['PAGE_AUTOCONNECT',['../boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9',1,'boot.php']]], @@ -9,6 +9,7 @@ var searchData= ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], ['page_5fpremium',['PAGE_PREMIUM',['../boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8',1,'boot.php']]], ['page_5fremoved',['PAGE_REMOVED',['../boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6',1,'boot.php']]], + ['page_5fsystem',['PAGE_SYSTEM',['../boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932',1,'boot.php']]], ['path',['path',['../namespacefriendica-to-smarty-tpl.html#a68d15934660cd1f4301ce251b1646f09',1,'friendica-to-smarty-tpl.path()'],['../namespaceupdatetpl.html#ae694f5e1f25f8a92a945eb90c432dfe6',1,'updatetpl.path()']]], ['perms_5fa_5fdelegate',['PERMS_A_DELEGATE',['../boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b',1,'boot.php']]], ['perms_5fa_5frepublish',['PERMS_A_REPUBLISH',['../boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead',1,'boot.php']]], diff --git a/doc/html/search/variables_78.js b/doc/html/search/variables_78.js index ef8c3194c..2d66c8f08 100644 --- a/doc/html/search/variables_78.js +++ b/doc/html/search/variables_78.js @@ -4,5 +4,6 @@ var searchData= ['xchan_5fflags_5fdeleted',['XCHAN_FLAGS_DELETED',['../boot_8php.html#a9ea1290e00c6d40684892047f2c778a9',1,'boot.php']]], ['xchan_5fflags_5fhidden',['XCHAN_FLAGS_HIDDEN',['../boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2',1,'boot.php']]], ['xchan_5fflags_5forphan',['XCHAN_FLAGS_ORPHAN',['../boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f',1,'boot.php']]], - ['xchan_5fflags_5fselfcensored',['XCHAN_FLAGS_SELFCENSORED',['../boot_8php.html#a5a681a672e007cdc22b43345d71f07c6',1,'boot.php']]] + ['xchan_5fflags_5fselfcensored',['XCHAN_FLAGS_SELFCENSORED',['../boot_8php.html#a5a681a672e007cdc22b43345d71f07c6',1,'boot.php']]], + ['xchan_5fflags_5fsystem',['XCHAN_FLAGS_SYSTEM',['../boot_8php.html#afef254290febac854c85fc698d9483a6',1,'boot.php']]] ]; diff --git a/doc/html/settings_8php.html b/doc/html/settings_8php.html index 8cd9e7063..cb50bbc52 100644 --- a/doc/html/settings_8php.html +++ b/doc/html/settings_8php.html @@ -116,8 +116,6 @@ Functions    settings_init (&$a)   - settings_aside (&$a) -   settings_post (&$a)   @@ -138,22 +136,6 @@ Functions

      Referenced by settings_post().

      - - - -
      -
      - - - - - - - - -
      settings_aside ($a)
      -
      -
      diff --git a/doc/html/settings_8php.js b/doc/html/settings_8php.js index facd5da67..9185251bc 100644 --- a/doc/html/settings_8php.js +++ b/doc/html/settings_8php.js @@ -1,7 +1,6 @@ var settings_8php = [ [ "get_theme_config_file", "settings_8php.html#a39abc76ff5459c57e3b957664f273f18", null ], - [ "settings_aside", "settings_8php.html#ae5aebccb006bee1300078576baaf5582", null ], [ "settings_init", "settings_8php.html#a3a4cde287482fced008583f54ba2a722", null ], [ "settings_post", "settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586", null ] ]; \ No newline at end of file diff --git a/doc/html/socgraph_8php.html b/doc/html/socgraph_8php.html index d85a7c0a7..47a2222ca 100644 --- a/doc/html/socgraph_8php.html +++ b/doc/html/socgraph_8php.html @@ -168,8 +168,6 @@ Functions
      -

      Referenced by allfriends_content().

      -
      diff --git a/doc/html/suggest_8php.html b/doc/html/suggest_8php.html index 9dcf0c0e7..822cf8fd4 100644 --- a/doc/html/suggest_8php.html +++ b/doc/html/suggest_8php.html @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('suggest_8php.html','');}); Functions  suggest_init (&$a)   - suggest_aside (&$a) -   suggest_content (&$a)  

      Function Documentation

      - -
      -
      - - - - - - - - -
      suggest_aside ($a)
      -
      - -
      -
      diff --git a/doc/html/suggest_8php.js b/doc/html/suggest_8php.js index 98b2888c5..6a1ef5b3d 100644 --- a/doc/html/suggest_8php.js +++ b/doc/html/suggest_8php.js @@ -1,6 +1,5 @@ var suggest_8php = [ - [ "suggest_aside", "suggest_8php.html#a4df91c84594d51ba56b5918de414230d", null ], [ "suggest_content", "suggest_8php.html#a58748a8235d4523f8333847f3e42dd91", null ], [ "suggest_init", "suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c", null ] ]; \ No newline at end of file diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 9ee0d4d8a..14fb70f25 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -582,7 +582,7 @@ Variables
      @@ -634,7 +634,7 @@ Variables @@ -1287,7 +1287,7 @@ Variables
      -

      Referenced by account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), advanced_profile(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), authenticate_success(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), group_content(), guess_image_type(), head_set_icon(), http_status_exit(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), localize_item(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_store(), menu_edit(), message_post(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), onedirsync_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), public_recips(), 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(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

      +

      Referenced by account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), advanced_profile(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), authenticate_success(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), fix_private_photos(), fix_system_urls(), get_atom_elements(), get_item_elements(), Conversation\get_template_data(), group_content(), guess_image_type(), head_set_icon(), http_status_exit(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), localize_item(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_store(), menu_edit(), message_post(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), onedirsync_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), public_recips(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), 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(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

      @@ -1468,7 +1468,7 @@ Variables
      Returns
      string Filtered string
      -

      Referenced by admin_page_logs_post(), admin_page_site_post(), channel_content(), community_content(), connections_content(), conversation(), create_account(), directory_content(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_store(), message_post(), mood_init(), network_content(), oexchange_content(), photos_post(), poco_init(), poke_init(), profiles_post(), qsearch_init(), register_post(), sanitise_acl(), settings_post(), setup_content(), setup_post(), subthread_content(), tagger_content(), and xrd_init().

      +

      Referenced by admin_page_logs_post(), admin_page_site_post(), channel_content(), community_content(), connections_content(), conversation(), create_account(), directory_content(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_store(), message_post(), mood_init(), network_content(), oexchange_content(), photos_post(), poco_init(), poke_init(), profiles_post(), register_post(), sanitise_acl(), settings_post(), setup_content(), setup_post(), subthread_content(), tagger_content(), and xrd_init().

      @@ -1707,7 +1707,7 @@ Variables @@ -1772,7 +1772,7 @@ Variables
      Returns
      string substituted string
      -

      Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), 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(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), dir_safe_mode(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_aside(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), send_reg_approval_email(), send_verification_email(), settings_aside(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_archive(), widget_filer(), widget_follow(), widget_notes(), widget_savedsearch(), widget_suggestions(), writepages_widget(), and xrd_init().

      +

      Referenced by admin_content(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chanview_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), dir_safe_mode(), dir_sort_links(), directory_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), photos_album_widget(), photos_content(), poco_init(), poke_content(), populate_acl(), posted_date_widget(), profile_sidebar(), profiles_content(), redbasic_form(), register_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_archive(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), writepages_widget(), and xrd_init().

      @@ -2130,7 +2130,7 @@ Variables diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 84a43b90e..9a08f8c75 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_hubloc(), 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(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), build_sync_packet(), cal(), call_hooks(), categories_widget(), 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(), cli_suggest_run(), comanche_menu(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), directory_aside(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_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_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), 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(), head_get_icon(), head_remove_css(), head_remove_js(), head_set_icon(), help_content(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), manual_config(), match_content(), menu_content(), message_aside(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), redir_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_aside(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), subthread_content(), suggest_aside(), suggest_content(), t(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), terminate_friendship(), tgroup_check(), theme_admin(), 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(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_filer(), widget_follow(), widget_fullprofile(), widget_profile(), widget_savedsearch(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

      +

      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_hubloc(), 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(), 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(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), build_sync_packet(), cal(), call_hooks(), categories_widget(), 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(), cli_suggest_run(), comanche_menu(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connect_content(), connect_init(), connect_post(), connections_clone(), connections_content(), connections_init(), connections_post(), connedit_clone(), connedit_content(), connedit_init(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), directory_aside(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_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_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), head_get_icon(), head_remove_css(), head_remove_js(), head_set_icon(), help_content(), home_content(), home_init(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), manual_config(), match_content(), message_content(), message_post(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), subthread_content(), suggest_content(), t(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), terminate_friendship(), tgroup_check(), theme_admin(), 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(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

      diff --git a/doc/html/widgets_8php.html b/doc/html/widgets_8php.html index df9959890..9272454ca 100644 --- a/doc/html/widgets_8php.html +++ b/doc/html/widgets_8php.html @@ -112,8 +112,6 @@ $(document).ready(function(){initNavTree('widgets_8php.html','');}); - - @@ -140,23 +138,20 @@ Functions + + + + + + + + + + + +

      Functions

       list_widgets ()
       
       widget_profile ($args)
       
       widget_tagcloud ($args)
       
       widget_affinity ($arr)
       
       widget_settings_menu ($arr)
       
       widget_mailmenu ($arr)
       
       widget_design_tools ($arr)
       
       widget_findpeople ($arr)
       
       widget_photo_albums ($arr)
       
       widget_vcard ($arr)
       

      Function Documentation

      - -
      -
      - - - - - - - -
      list_widgets ()
      -
      - -
      -
      @@ -219,6 +214,22 @@ Functions
      +
      +
      + +
      +
      + + + + + + + + +
      widget_design_tools ( $arr)
      +
      +
      @@ -235,6 +246,22 @@ Functions
      +
      + + +
      +
      + + + + + + + + +
      widget_findpeople ( $arr)
      +
      +
      @@ -251,8 +278,6 @@ Functions
      -

      Referenced by connections_aside(), and suggest_aside().

      -
      @@ -269,6 +294,22 @@ Functions
      +
      + + +
      +
      + + + + + + + + +
      widget_mailmenu ( $arr)
      +
      +
      @@ -285,6 +326,22 @@ Functions
      +
      + + +
      +
      + + + + + + + + +
      widget_photo_albums ( $arr)
      +
      +
      @@ -317,6 +374,22 @@ Functions
      +
      + + +
      +
      + + + + + + + + +
      widget_settings_menu ( $arr)
      +
      +
      @@ -333,7 +406,7 @@ Functions
      -

      Referenced by connections_aside(), and directory_content().

      +

      Referenced by directory_content().

      @@ -367,6 +440,22 @@ Functions
      +
      + + +
      +
      + + + + + + + + +
      widget_vcard ( $arr)
      +
      +
      diff --git a/doc/html/widgets_8php.js b/doc/html/widgets_8php.js index d83669dc3..6af0e6423 100644 --- a/doc/html/widgets_8php.js +++ b/doc/html/widgets_8php.js @@ -1,17 +1,22 @@ var widgets_8php = [ - [ "list_widgets", "widgets_8php.html#a8e670642c7a957d2b5578dfb75aedc05", null ], [ "widget_affinity", "widgets_8php.html#add9b24d3304e529a7975e96122315554", null ], [ "widget_archive", "widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65", null ], [ "widget_categories", "widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b", null ], [ "widget_collections", "widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f", null ], + [ "widget_design_tools", "widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b", null ], [ "widget_filer", "widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0", null ], + [ "widget_findpeople", "widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2", null ], [ "widget_follow", "widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd", null ], [ "widget_fullprofile", "widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165", null ], + [ "widget_mailmenu", "widgets_8php.html#afa2e55a78f95667a6da082efac7fec74", null ], [ "widget_notes", "widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256", null ], + [ "widget_photo_albums", "widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e", null ], [ "widget_profile", "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ], [ "widget_savedsearch", "widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8", null ], + [ "widget_settings_menu", "widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01", null ], [ "widget_suggestions", "widgets_8php.html#a0d404276fedc59f5038cf5c085028326", null ], [ "widget_tagcloud", "widgets_8php.html#a6dbc227aac750774284ee39c45f0a200", null ], - [ "widget_tagcloud_wall", "widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653", null ] + [ "widget_tagcloud_wall", "widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653", null ], + [ "widget_vcard", "widgets_8php.html#abe03366fd22fd27d683518fa0765da50", null ] ]; \ No newline at end of file diff --git a/doc/html/zfinger_8php.html b/doc/html/zfinger_8php.html index e41ca2a51..b35337c42 100644 --- a/doc/html/zfinger_8php.html +++ b/doc/html/zfinger_8php.html @@ -129,6 +129,8 @@ Functions
      +

      The special address '[system]' will return a system channel if one has been defined, Or the first valid channel we find if there are no system channels.

      +

      This is used by magic-auth if we have no prior communications with this site - and returns an identity on this site which we can use to create a valid hub record so that we can exchange signed messages. The precise identity is irrelevant. It's the hub information that we really need at the other end - and this will return it.

      Referenced by _well_known_init().

      diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 014f6795b..1efc34a39 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -213,7 +213,7 @@ Functions

      Send a zot packet to all hubs where this channel is duplicated, refreshing such things as personal settings, channel permissions, address book updates, etc.

      -

      Referenced by connections_clone(), and settings_post().

      +

      Referenced by connections_clone(), connedit_clone(), and settings_post().

      @@ -1028,7 +1028,7 @@ which will be processed and delivered before this function ultimately returns.
      Returns
      boolean true if successful, else false
      -

      Referenced by connections_content(), import_author_zot(), onepoll_run(), and post_post().

      +

      Referenced by connedit_content(), import_author_zot(), onepoll_run(), and post_post().

      From a084a3fa47879f00a535501f14f32c3ff55f7d29 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 20 Dec 2013 01:39:42 -0800 Subject: [PATCH 20/24] comanchify mod_search - we've got three modules left to Comanchify: admin, directory and message - each of which introduces "interesting challenges" --- mod/search.php | 124 +-- util/messages.po | 2252 +++++++++++++++++++-------------------- version.inc | 2 +- view/pdl/mod_search.pdl | 3 + 4 files changed, 1121 insertions(+), 1260 deletions(-) create mode 100644 view/pdl/mod_search.pdl diff --git a/mod/search.php b/mod/search.php index 2b31002fa..32c8ca38e 100644 --- a/mod/search.php +++ b/mod/search.php @@ -1,76 +1,8 @@ '; - $o .= '

      ' . t('Saved Searches') . '

      ' . "\r\n"; - $o .= '
      ' . "\r\n"; - } - - return $o; - -} - - function search_init(&$a) { - - $search = ((x($_GET,'search')) ? trim(rawurldecode($_GET['search'])) : ''); - - if(local_user()) { - if(x($_GET,'save') && $search) { - $r = q("select `tid` from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", - intval(local_user()), - intval(TERM_SAVEDSEARCH), - dbesc($search) - ); - if(! count($r)) { - q("insert into `term` ( `uid`,`type`,`term` ) values ( %d, %d, '%s') ", - intval(local_user()), - intval(TERM_SAVEDSEARCH), - dbesc($search) - ); - } - } - if(x($_GET,'remove') && $search) { - q("delete from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", - intval(local_user()), - intval(TERM_SAVEDSEARCH), - dbesc($search) - ); - } - - $a->page['aside'] .= search_saved_searches(); - - } - else { - unset($_SESSION['theme']); - unset($_SESSION['mobile_theme']); - } - - - -} - - - -function search_post(&$a) { - if(x($_POST,'search')) - $a->data['search'] = $_POST['search']; + if(x($_REQUEST,'search')) + $a->data['search'] = $_REQUEST['search']; } @@ -133,10 +65,7 @@ function search_content(&$a,$update = 0, $load = false) { ); } else { - if (get_config('system','use_fulltext_engine')) - $sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(protect_sprintf($search))); - else - $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); + $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); } // Here is the way permissions work in the search module... @@ -144,9 +73,6 @@ function search_content(&$a,$update = 0, $load = false) { // OR your own posts if you are a logged in member // No items will be shown if the member has a blocked profile wall. - - - if((! $update) && (! $load)) { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, @@ -223,54 +149,12 @@ function search_content(&$a,$update = 0, $load = false) { } if($r) { - -// $parents_str = ids_to_querystr($r,'item_id'); - -// $items = q("SELECT `item`.*, `item`.`id` AS `item_id` -// FROM `item` -// WHERE item_restrict = 0 -// $sql_extra and parent in ( $parents_str ) " -// ); - xchan_query($r); $items = fetch_post_tags($r,true); -// $items = conv_sort($items,'created'); - } else { $items = array(); } -//logger('mod_search: items ' . count($items)); - -// $r = q("SELECT distinct(`item`.`mid`), `item`.*, `item`.`id` AS `item_id`, -// `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, -// `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, -// `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, -// `user`.`nickname` -// FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` -// LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` -// WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 -// AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) -// OR `item`.`uid` = %d ) -// AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 -// $sql_extra -// group by `item`.`mid` -// ORDER BY `received` DESC LIMIT %d , %d ", -// intval(local_user()), -// intval($a->pager['start']), -// intval($a->pager['itemspage']) - -// ); - - -// $a = fetch_post_tags($a,true); - -// if(! $items) {// -// info( t('No results.') . EOL); -// return $o; -// } - - if($tag) $o .= '

      Items tagged with: ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '

      '; else @@ -278,8 +162,6 @@ function search_content(&$a,$update = 0, $load = false) { $o .= conversation($a,$items,'search',$update,'client'); -// $o .= alt_pager($a,count($r)); - return $o; } diff --git a/util/messages.po b/util/messages.po index db21568c7..96a8b76f1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-12-13.526\n" +"Project-Id-Version: 2013-12-20.532\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-13 00:04-0800\n" +"POT-Creation-Date: 2013-12-20 00:02-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,6 +81,10 @@ msgstr "" msgid "Safe Mode" msgstr "" +#: ../../include/api.php:973 +msgid "Public Timeline" +msgstr "" + #: ../../include/enotify.php:40 msgid "Red Matrix Notification" msgstr "" @@ -152,9 +156,9 @@ msgstr "" msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../include/enotify.php:171 ../../include/enotify.php:190 -#: ../../include/enotify.php:216 ../../include/enotify.php:235 -#: ../../include/enotify.php:249 +#: ../../include/enotify.php:171 ../../include/enotify.php:187 +#: ../../include/enotify.php:213 ../../include/enotify.php:232 +#: ../../include/enotify.php:246 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" @@ -174,119 +178,119 @@ msgstr "" msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../include/enotify.php:209 +#: ../../include/enotify.php:206 #, php-format msgid "[Red:Notify] %s tagged you" msgstr "" -#: ../../include/enotify.php:210 +#: ../../include/enotify.php:207 #, php-format msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../include/enotify.php:211 +#: ../../include/enotify.php:208 #, php-format msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../include/enotify.php:224 +#: ../../include/enotify.php:221 #, php-format msgid "[Red:Notify] %1$s poked you" msgstr "" -#: ../../include/enotify.php:225 +#: ../../include/enotify.php:222 #, php-format msgid "%1$s, %2$s poked you at %3$s" msgstr "" -#: ../../include/enotify.php:226 +#: ../../include/enotify.php:223 #, php-format msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../include/enotify.php:242 +#: ../../include/enotify.php:239 #, php-format msgid "[Red:Notify] %s tagged your post" msgstr "" -#: ../../include/enotify.php:243 +#: ../../include/enotify.php:240 #, php-format msgid "%1$s, %2$s tagged your post at %3$s" msgstr "" -#: ../../include/enotify.php:244 +#: ../../include/enotify.php:241 #, php-format msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "" -#: ../../include/enotify.php:256 +#: ../../include/enotify.php:253 msgid "[Red:Notify] Introduction received" msgstr "" -#: ../../include/enotify.php:257 +#: ../../include/enotify.php:254 #, php-format msgid "%1$s, you've received an introduction from '%2$s' at %3$s" msgstr "" -#: ../../include/enotify.php:258 +#: ../../include/enotify.php:255 #, php-format msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." msgstr "" -#: ../../include/enotify.php:262 ../../include/enotify.php:281 +#: ../../include/enotify.php:259 ../../include/enotify.php:278 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:264 +#: ../../include/enotify.php:261 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/enotify.php:271 +#: ../../include/enotify.php:268 msgid "[Red:Notify] Friend suggestion received" msgstr "" -#: ../../include/enotify.php:272 +#: ../../include/enotify.php:269 #, php-format msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "" -#: ../../include/enotify.php:273 +#: ../../include/enotify.php:270 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." msgstr "" -#: ../../include/enotify.php:279 +#: ../../include/enotify.php:276 msgid "Name:" msgstr "" -#: ../../include/enotify.php:280 +#: ../../include/enotify.php:277 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:283 +#: ../../include/enotify.php:280 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/ItemObject.php:88 ../../mod/photos.php:963 +#: ../../include/ItemObject.php:88 ../../mod/photos.php:959 msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:118 ../../mod/settings.php:671 ../../mod/menu.php:55 -#: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 +#: ../../mod/webpages.php:118 ../../mod/menu.php:55 ../../mod/layouts.php:102 +#: ../../mod/settings.php:569 ../../mod/editlayout.php:100 #: ../../mod/editwebpage.php:143 ../../mod/blocks.php:93 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114 msgid "Edit" msgstr "" #: ../../include/ItemObject.php:107 ../../include/conversation.php:632 -#: ../../mod/settings.php:672 ../../mod/admin.php:693 ../../mod/group.php:182 -#: ../../mod/photos.php:1141 ../../mod/connections.php:378 -#: ../../mod/filestorage.php:82 +#: ../../mod/connedit.php:356 ../../mod/admin.php:693 ../../mod/group.php:176 +#: ../../mod/photos.php:1137 ../../mod/filestorage.php:82 +#: ../../mod/settings.php:570 msgid "Delete" msgstr "" @@ -322,7 +326,7 @@ msgstr "" msgid "add tag" msgstr "" -#: ../../include/ItemObject.php:174 ../../mod/photos.php:1069 +#: ../../include/ItemObject.php:174 ../../mod/photos.php:1065 msgid "I like this (toggle)" msgstr "" @@ -330,7 +334,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1070 +#: ../../include/ItemObject.php:175 ../../mod/photos.php:1066 msgid "I don't like this (toggle)" msgstr "" @@ -378,8 +382,8 @@ msgid "last edited: %s" msgstr "" #: ../../include/ItemObject.php:246 ../../include/conversation.php:706 -#: ../../include/conversation.php:1116 ../../mod/photos.php:1072 -#: ../../mod/message.php:332 ../../mod/message.php:484 +#: ../../include/conversation.php:1116 ../../mod/photos.php:1068 +#: ../../mod/message.php:309 ../../mod/message.php:460 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:152 #: ../../mod/editpost.php:106 ../../mod/editblock.php:123 msgid "Please wait" @@ -393,35 +397,35 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 -#: ../../include/contact_widgets.php:124 +#: ../../include/contact_widgets.php:125 msgid "show more" msgstr "" -#: ../../include/ItemObject.php:527 ../../mod/photos.php:1088 -#: ../../mod/photos.php:1175 +#: ../../include/ItemObject.php:527 ../../mod/photos.php:1084 +#: ../../mod/photos.php:1171 msgid "This is you" msgstr "" #: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1090 ../../mod/photos.php:1177 +#: ../../mod/photos.php:1086 ../../mod/photos.php:1173 msgid "Comment" msgstr "" #: ../../include/ItemObject.php:530 ../../mod/events.php:470 -#: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 -#: ../../mod/setup.php:345 ../../mod/settings.php:609 -#: ../../mod/settings.php:721 ../../mod/settings.php:749 -#: ../../mod/settings.php:773 ../../mod/settings.php:844 -#: ../../mod/settings.php:1005 ../../mod/connect.php:96 -#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:420 +#: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/connedit.php:434 +#: ../../mod/setup.php:302 ../../mod/setup.php:345 ../../mod/connect.php:96 +#: ../../mod/sources.php:97 ../../mod/sources.php:131 ../../mod/admin.php:420 #: ../../mod/admin.php:686 ../../mod/admin.php:826 ../../mod/admin.php:1025 -#: ../../mod/admin.php:1112 ../../mod/group.php:87 ../../mod/photos.php:685 -#: ../../mod/photos.php:790 ../../mod/photos.php:1051 -#: ../../mod/photos.php:1091 ../../mod/photos.php:1178 -#: ../../mod/message.php:333 ../../mod/message.php:483 -#: ../../mod/profiles.php:518 ../../mod/connections.php:456 -#: ../../mod/import.php:387 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 -#: ../../mod/mood.php:137 ../../view/theme/redbasic/php/config.php:85 +#: ../../mod/admin.php:1112 ../../mod/group.php:81 ../../mod/photos.php:681 +#: ../../mod/photos.php:786 ../../mod/photos.php:1047 +#: ../../mod/photos.php:1087 ../../mod/photos.php:1174 +#: ../../mod/message.php:310 ../../mod/message.php:459 +#: ../../mod/profiles.php:518 ../../mod/import.php:387 +#: ../../mod/settings.php:507 ../../mod/settings.php:619 +#: ../../mod/settings.php:647 ../../mod/settings.php:671 +#: ../../mod/settings.php:742 ../../mod/settings.php:903 +#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:137 +#: ../../view/theme/redbasic/php/config.php:85 #: ../../view/theme/apw/php/config.php:231 #: ../../view/theme/blogga/view/theme/blog/config.php:67 #: ../../view/theme/blogga/php/config.php:67 @@ -461,154 +465,188 @@ msgid "Video" msgstr "" #: ../../include/ItemObject.php:539 ../../include/conversation.php:1079 -#: ../../mod/webpages.php:122 ../../mod/photos.php:1092 +#: ../../mod/webpages.php:122 ../../mod/photos.php:1088 #: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:176 #: ../../mod/editpost.php:126 ../../mod/editblock.php:144 msgid "Preview" msgstr "" #: ../../include/ItemObject.php:542 ../../include/conversation.php:1143 -#: ../../mod/message.php:338 ../../mod/message.php:489 +#: ../../mod/message.php:315 ../../mod/message.php:465 #: ../../mod/editpost.php:134 msgid "Encrypt text" msgstr "" -#: ../../include/Contact.php:87 ../../include/widgets.php:96 -#: ../../include/widgets.php:136 ../../include/identity.php:613 -#: ../../mod/match.php:62 ../../mod/suggest.php:58 ../../mod/directory.php:199 +#: ../../include/Contact.php:104 ../../include/widgets.php:112 +#: ../../include/widgets.php:152 ../../include/identity.php:613 +#: ../../mod/match.php:62 ../../mod/suggest.php:51 ../../mod/directory.php:197 msgid "Connect" msgstr "" -#: ../../include/Contact.php:103 +#: ../../include/Contact.php:120 msgid "New window" msgstr "" -#: ../../include/Contact.php:104 +#: ../../include/Contact.php:121 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/widgets.php:5 -msgid "Displays a full channel profile" -msgstr "" - -#: ../../include/widgets.php:6 -msgid "Tag cloud of webpage categories" -msgstr "" - -#: ../../include/widgets.php:7 -msgid "List and filter by collection" -msgstr "" - -#: ../../include/widgets.php:8 -msgid "Show a couple of channel suggestion" -msgstr "" - -#: ../../include/widgets.php:9 -msgid "Provide a channel follow form" -msgstr "" - -#: ../../include/widgets.php:39 ../../include/contact_widgets.php:86 +#: ../../include/widgets.php:26 ../../include/contact_widgets.php:87 msgid "Categories" msgstr "" -#: ../../include/widgets.php:98 ../../mod/suggest.php:60 +#: ../../include/widgets.php:114 ../../mod/suggest.php:53 msgid "Ignore/Hide" msgstr "" -#: ../../include/widgets.php:104 ../../mod/connections.php:583 +#: ../../include/widgets.php:120 ../../mod/connections.php:236 msgid "Suggestions" msgstr "" -#: ../../include/widgets.php:105 +#: ../../include/widgets.php:121 msgid "See more..." msgstr "" -#: ../../include/widgets.php:127 +#: ../../include/widgets.php:143 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/widgets.php:133 +#: ../../include/widgets.php:149 msgid "Add New Connection" msgstr "" -#: ../../include/widgets.php:134 +#: ../../include/widgets.php:150 msgid "Enter the channel address" msgstr "" -#: ../../include/widgets.php:135 +#: ../../include/widgets.php:151 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../include/widgets.php:152 +#: ../../include/widgets.php:168 msgid "Notes" msgstr "" -#: ../../include/widgets.php:154 ../../include/text.php:738 +#: ../../include/widgets.php:170 ../../include/text.php:738 #: ../../include/text.php:752 ../../mod/filer.php:36 msgid "Save" msgstr "" -#: ../../include/widgets.php:224 ../../mod/search.php:20 +#: ../../include/widgets.php:240 ../../mod/search.php:20 msgid "Remove term" msgstr "" -#: ../../include/widgets.php:233 ../../include/features.php:48 +#: ../../include/widgets.php:249 ../../include/features.php:48 #: ../../mod/search.php:17 msgid "Saved Searches" msgstr "" -#: ../../include/widgets.php:234 ../../include/group.php:290 +#: ../../include/widgets.php:250 ../../include/group.php:290 msgid "add" msgstr "" -#: ../../include/widgets.php:264 ../../include/features.php:62 -#: ../../include/contact_widgets.php:52 +#: ../../include/widgets.php:280 ../../include/features.php:62 +#: ../../include/contact_widgets.php:53 msgid "Saved Folders" msgstr "" -#: ../../include/widgets.php:267 ../../include/contact_widgets.php:55 -#: ../../include/contact_widgets.php:89 +#: ../../include/widgets.php:283 ../../include/contact_widgets.php:56 +#: ../../include/contact_widgets.php:90 msgid "Everything" msgstr "" -#: ../../include/widgets.php:299 ../../include/items.php:3550 +#: ../../include/widgets.php:315 ../../include/items.php:3558 msgid "Archives" msgstr "" -#: ../../include/widgets.php:351 +#: ../../include/widgets.php:367 msgid "Refresh" msgstr "" -#: ../../include/widgets.php:352 ../../mod/connections.php:408 +#: ../../include/widgets.php:368 ../../mod/connedit.php:386 msgid "Me" msgstr "" -#: ../../include/widgets.php:353 ../../mod/connections.php:410 +#: ../../include/widgets.php:369 ../../mod/connedit.php:388 msgid "Best Friends" msgstr "" -#: ../../include/widgets.php:354 ../../include/profile_selectors.php:42 -#: ../../include/identity.php:298 ../../mod/connections.php:411 +#: ../../include/widgets.php:370 ../../include/profile_selectors.php:42 +#: ../../include/identity.php:298 ../../mod/connedit.php:389 msgid "Friends" msgstr "" -#: ../../include/widgets.php:355 +#: ../../include/widgets.php:371 msgid "Co-workers" msgstr "" -#: ../../include/widgets.php:356 ../../mod/connections.php:412 +#: ../../include/widgets.php:372 ../../mod/connedit.php:390 msgid "Former Friends" msgstr "" -#: ../../include/widgets.php:357 ../../mod/connections.php:413 +#: ../../include/widgets.php:373 ../../mod/connedit.php:391 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:358 +#: ../../include/widgets.php:374 msgid "Everybody" msgstr "" +#: ../../include/widgets.php:406 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:412 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:418 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:424 +msgid "Feature settings" +msgstr "" + +#: ../../include/widgets.php:430 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:436 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:442 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:454 +msgid "Automatic Permissions (Advanced)" +msgstr "" + +#: ../../include/widgets.php:464 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:473 ../../include/features.php:39 +#: ../../mod/sources.php:81 +msgid "Channel Sources" +msgstr "" + +#: ../../include/widgets.php:484 ../../include/nav.php:177 +#: ../../mod/admin.php:785 ../../mod/admin.php:990 +msgid "Settings" +msgstr "" + +#: ../../include/widgets.php:501 +msgid "Check Mail" +msgstr "" + +#: ../../include/widgets.php:506 ../../include/nav.php:168 +msgid "New Message" +msgstr "" + #: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "" @@ -670,7 +708,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:689 -#: ../../mod/admin.php:698 ../../boot.php:1442 +#: ../../mod/admin.php:698 ../../boot.php:1418 msgid "Email" msgstr "" @@ -790,7 +828,7 @@ msgstr "" #: ../../include/event.php:40 ../../include/identity.php:664 #: ../../include/bb2diaspora.php:455 ../../mod/events.php:463 -#: ../../mod/directory.php:174 +#: ../../mod/directory.php:172 msgid "Location:" msgstr "" @@ -845,7 +883,7 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: ../../include/js_strings.php:11 ../../mod/photos.php:45 +#: ../../include/js_strings.php:11 ../../mod/photos.php:39 msgid "everybody" msgstr "" @@ -947,16 +985,12 @@ msgid "Stored post could not be verified." msgstr "" #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:775 ../../mod/photos.php:797 +#: ../../mod/photos.php:91 ../../mod/photos.php:771 ../../mod/photos.php:793 #: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 #: ../../mod/profile_photo.php:336 msgid "Profile Photos" msgstr "" -#: ../../include/api.php:972 -msgid "Public Timeline" -msgstr "" - #: ../../include/network.php:640 msgid "view full size" msgstr "" @@ -1077,11 +1111,6 @@ msgstr "" msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:39 ../../mod/settings.php:120 -#: ../../mod/sources.php:67 -msgid "Channel Sources" -msgstr "" - #: ../../include/features.php:39 msgid "Automatically import channel content from other channels or feeds" msgstr "" @@ -1220,27 +1249,28 @@ msgstr "" #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 #: ../../include/attach.php:464 ../../include/attach.php:539 -#: ../../include/items.php:3429 ../../mod/common.php:35 +#: ../../include/items.php:3437 ../../mod/common.php:35 #: ../../mod/events.php:140 ../../mod/invite.php:13 ../../mod/invite.php:102 -#: ../../mod/allfriends.php:10 ../../mod/webpages.php:40 ../../mod/api.php:26 +#: ../../mod/connedit.php:179 ../../mod/webpages.php:40 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/page.php:30 ../../mod/page.php:80 -#: ../../mod/setup.php:200 ../../mod/settings.php:586 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:73 -#: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:654 -#: ../../mod/viewsrc.php:12 ../../mod/menu.php:40 ../../mod/message.php:208 -#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12 +#: ../../mod/setup.php:200 ../../mod/viewconnections.php:22 +#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6 +#: ../../mod/sources.php:62 ../../mod/mitem.php:73 ../../mod/group.php:9 +#: ../../mod/photos.php:68 ../../mod/photos.php:650 ../../mod/viewsrc.php:12 +#: ../../mod/menu.php:40 ../../mod/message.php:185 +#: ../../mod/connections.php:167 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:42 ../../mod/network.php:12 #: ../../mod/profiles.php:152 ../../mod/profiles.php:465 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/connections.php:201 ../../mod/filestorage.php:26 -#: ../../mod/manage.php:6 ../../mod/editlayout.php:48 +#: ../../mod/filestorage.php:26 ../../mod/manage.php:6 +#: ../../mod/settings.php:484 ../../mod/editlayout.php:48 #: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200 #: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83 #: ../../mod/notifications.php:66 ../../mod/blocks.php:29 #: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128 #: ../../mod/channel.php:86 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189 -#: ../../mod/suggest.php:33 ../../mod/register.php:68 ../../mod/regmod.php:18 +#: ../../mod/suggest.php:26 ../../mod/register.php:68 ../../mod/regmod.php:18 #: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178 #: ../../index.php:346 msgid "Permission denied." @@ -1263,12 +1293,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:288 ../../include/conversation.php:1457 +#: ../../include/photos.php:296 ../../include/conversation.php:1457 msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:292 ../../mod/photos.php:813 -#: ../../mod/photos.php:1287 +#: ../../include/photos.php:300 ../../mod/photos.php:809 +#: ../../mod/photos.php:1283 msgid "Upload New Photos" msgstr "" @@ -1571,7 +1601,7 @@ msgstr "" msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1439 +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1415 msgid "Logout" msgstr "" @@ -1588,7 +1618,7 @@ msgid "Your posts and conversations" msgstr "" #: ../../include/nav.php:76 ../../include/conversation.php:929 -#: ../../mod/connections.php:331 ../../mod/connections.php:445 +#: ../../mod/connedit.php:309 ../../mod/connedit.php:423 msgid "View Profile" msgstr "" @@ -1613,7 +1643,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:85 ../../boot.php:1440 +#: ../../include/nav.php:85 ../../boot.php:1416 msgid "Login" msgstr "" @@ -1634,7 +1664,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1416 +#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1392 msgid "Register" msgstr "" @@ -1642,7 +1672,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 +#: ../../include/nav.php:130 ../../mod/help.php:60 ../../mod/help.php:64 msgid "Help" msgstr "" @@ -1667,7 +1697,7 @@ msgstr "" msgid "Search site content" msgstr "" -#: ../../include/nav.php:138 ../../mod/directory.php:228 +#: ../../include/nav.php:138 ../../mod/directory.php:226 msgid "Directory" msgstr "" @@ -1703,7 +1733,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:156 ../../mod/connections.php:589 +#: ../../include/nav.php:156 ../../mod/connections.php:242 msgid "New Connections" msgstr "" @@ -1747,10 +1777,6 @@ msgstr "" msgid "Outbox" msgstr "" -#: ../../include/nav.php:168 ../../mod/message.php:24 -msgid "New Message" -msgstr "" - #: ../../include/nav.php:171 ../../include/conversation.php:1465 #: ../../mod/events.php:354 msgid "Events" @@ -1776,16 +1802,11 @@ msgstr "" msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:177 ../../mod/settings.php:131 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 -msgid "Settings" -msgstr "" - #: ../../include/nav.php:177 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:179 ../../mod/connections.php:694 +#: ../../include/nav.php:179 ../../mod/connections.php:349 msgid "Connections" msgstr "" @@ -2060,8 +2081,8 @@ msgstr "" msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1063 ../../mod/message.php:281 -#: ../../mod/message.php:417 +#: ../../include/conversation.php:1063 ../../mod/message.php:258 +#: ../../mod/message.php:393 msgid "Please enter a link URL:" msgstr "" @@ -2085,12 +2106,12 @@ msgstr "" msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1069 ../../mod/message.php:282 -#: ../../mod/message.php:418 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1069 ../../mod/message.php:259 +#: ../../mod/message.php:394 ../../mod/editpost.php:52 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1093 ../../mod/photos.php:1071 +#: ../../include/conversation.php:1093 ../../mod/photos.php:1067 msgid "Share" msgstr "" @@ -2098,8 +2119,8 @@ msgstr "" msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1097 ../../mod/message.php:329 -#: ../../mod/message.php:480 ../../mod/editlayout.php:101 +#: ../../include/conversation.php:1097 ../../mod/message.php:306 +#: ../../mod/message.php:456 ../../mod/editlayout.php:101 #: ../../mod/editwebpage.php:144 ../../mod/editpost.php:98 #: ../../mod/editblock.php:115 msgid "Upload photo" @@ -2109,8 +2130,8 @@ msgstr "" msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1099 ../../mod/message.php:330 -#: ../../mod/message.php:481 ../../mod/editlayout.php:102 +#: ../../include/conversation.php:1099 ../../mod/message.php:307 +#: ../../mod/message.php:457 ../../mod/editlayout.php:102 #: ../../mod/editwebpage.php:145 ../../mod/editpost.php:99 #: ../../mod/editblock.php:116 msgid "Attach file" @@ -2120,8 +2141,8 @@ msgstr "" msgid "attach file" msgstr "" -#: ../../include/conversation.php:1101 ../../mod/message.php:331 -#: ../../mod/message.php:482 ../../mod/editlayout.php:103 +#: ../../include/conversation.php:1101 ../../mod/message.php:308 +#: ../../mod/message.php:458 ../../mod/editlayout.php:103 #: ../../mod/editwebpage.php:146 ../../mod/editpost.php:100 #: ../../mod/editblock.php:117 msgid "Insert web link" @@ -2201,8 +2222,8 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1141 ../../mod/message.php:336 -#: ../../mod/message.php:487 ../../mod/editlayout.php:134 +#: ../../include/conversation.php:1141 ../../mod/message.php:313 +#: ../../mod/message.php:463 ../../mod/editlayout.php:134 #: ../../mod/editwebpage.php:181 ../../mod/editpost.php:132 #: ../../mod/editblock.php:149 msgid "Set expiration date" @@ -2233,7 +2254,7 @@ msgid "Posts that mention or involve you" msgstr "" #: ../../include/conversation.php:1387 ../../mod/menu.php:57 -#: ../../mod/connections.php:556 +#: ../../mod/connections.php:209 msgid "New" msgstr "" @@ -2320,12 +2341,12 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:24 ../../mod/connections.php:700 -#: ../../mod/directory.php:224 ../../mod/directory.php:229 +#: ../../include/contact_widgets.php:24 ../../mod/connections.php:355 +#: ../../mod/directory.php:222 ../../mod/directory.php:227 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:66 +#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:59 msgid "Channel Suggestions" msgstr "" @@ -2337,7 +2358,7 @@ msgstr "" msgid "Invite Friends" msgstr "" -#: ../../include/contact_widgets.php:119 +#: ../../include/contact_widgets.php:120 #, php-format msgid "%d connection in common" msgid_plural "%d connections in common" @@ -2861,17 +2882,17 @@ msgid "Edit visibility" msgstr "" #: ../../include/identity.php:666 ../../include/identity.php:891 -#: ../../mod/directory.php:176 +#: ../../mod/directory.php:174 msgid "Gender:" msgstr "" #: ../../include/identity.php:667 ../../include/identity.php:911 -#: ../../mod/directory.php:178 +#: ../../mod/directory.php:176 msgid "Status:" msgstr "" #: ../../include/identity.php:668 ../../include/identity.php:922 -#: ../../mod/directory.php:180 +#: ../../mod/directory.php:178 msgid "Homepage:" msgstr "" @@ -2914,7 +2935,7 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/identity.php:889 ../../mod/settings.php:1013 +#: ../../include/identity.php:889 ../../mod/settings.php:911 msgid "Full Name:" msgstr "" @@ -2959,7 +2980,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/identity.php:932 ../../mod/directory.php:182 +#: ../../include/identity.php:932 ../../mod/directory.php:180 msgid "About:" msgstr "" @@ -3025,36 +3046,36 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74 +#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:68 #: ../../mod/profperm.php:19 ../../index.php:345 msgid "Permission denied" msgstr "" -#: ../../include/items.php:3367 ../../mod/admin.php:150 +#: ../../include/items.php:3375 ../../mod/admin.php:150 #: ../../mod/admin.php:730 ../../mod/admin.php:933 ../../mod/viewsrc.php:18 -#: ../../mod/home.php:64 ../../mod/display.php:32 +#: ../../mod/home.php:63 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3718 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3726 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3733 +#: ../../include/items.php:3741 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:3740 +#: ../../include/items.php:3748 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:3751 +#: ../../include/items.php:3759 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:3754 +#: ../../include/items.php:3762 msgid "Connection not found." msgstr "" @@ -3221,8 +3242,8 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:141 ../../mod/message.php:326 -#: ../../mod/message.php:476 +#: ../../mod/invite.php:141 ../../mod/message.php:303 +#: ../../mod/message.php:452 msgid "Your message:" msgstr "" @@ -3258,13 +3279,328 @@ msgid "" "com" msgstr "" -#: ../../mod/allfriends.php:35 -#, php-format -msgid "Friends of %s" +#: ../../mod/connedit.php:49 ../../mod/connections.php:37 +msgid "Could not access contact record." msgstr "" -#: ../../mod/allfriends.php:41 -msgid "No friends to display." +#: ../../mod/connedit.php:63 ../../mod/connections.php:51 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/connedit.php:104 ../../mod/connections.php:92 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connedit.php:106 ../../mod/connections.php:94 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connedit.php:201 +msgid "Could not access address book record." +msgstr "" + +#: ../../mod/connedit.php:215 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../mod/connedit.php:222 +msgid "Channel has been unblocked" +msgstr "" + +#: ../../mod/connedit.php:223 +msgid "Channel has been blocked" +msgstr "" + +#: ../../mod/connedit.php:227 ../../mod/connedit.php:239 +#: ../../mod/connedit.php:251 ../../mod/connedit.php:263 +#: ../../mod/connedit.php:278 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../mod/connedit.php:234 +msgid "Channel has been unignored" +msgstr "" + +#: ../../mod/connedit.php:235 +msgid "Channel has been ignored" +msgstr "" + +#: ../../mod/connedit.php:246 +msgid "Channel has been unarchived" +msgstr "" + +#: ../../mod/connedit.php:247 +msgid "Channel has been archived" +msgstr "" + +#: ../../mod/connedit.php:258 +msgid "Channel has been unhidden" +msgstr "" + +#: ../../mod/connedit.php:259 +msgid "Channel has been hidden" +msgstr "" + +#: ../../mod/connedit.php:273 +msgid "Channel has been approved" +msgstr "" + +#: ../../mod/connedit.php:274 +msgid "Channel has been unapproved" +msgstr "" + +#: ../../mod/connedit.php:292 +msgid "Contact has been removed." +msgstr "" + +#: ../../mod/connedit.php:312 +#, php-format +msgid "View %s's profile" +msgstr "" + +#: ../../mod/connedit.php:316 +msgid "Refresh Permissions" +msgstr "" + +#: ../../mod/connedit.php:319 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../mod/connedit.php:323 +msgid "Recent Activity" +msgstr "" + +#: ../../mod/connedit.php:326 +msgid "View recent posts and comments" +msgstr "" + +#: ../../mod/connedit.php:330 ../../mod/connedit.php:472 +#: ../../mod/admin.php:695 +msgid "Unblock" +msgstr "" + +#: ../../mod/connedit.php:330 ../../mod/connedit.php:472 +#: ../../mod/admin.php:694 +msgid "Block" +msgstr "" + +#: ../../mod/connedit.php:333 +msgid "Block or Unblock this connection" +msgstr "" + +#: ../../mod/connedit.php:337 ../../mod/connedit.php:473 +msgid "Unignore" +msgstr "" + +#: ../../mod/connedit.php:337 ../../mod/connedit.php:473 +#: ../../mod/notifications.php:51 +msgid "Ignore" +msgstr "" + +#: ../../mod/connedit.php:340 +msgid "Ignore or Unignore this connection" +msgstr "" + +#: ../../mod/connedit.php:343 +msgid "Unarchive" +msgstr "" + +#: ../../mod/connedit.php:343 +msgid "Archive" +msgstr "" + +#: ../../mod/connedit.php:346 +msgid "Archive or Unarchive this connection" +msgstr "" + +#: ../../mod/connedit.php:349 +msgid "Unhide" +msgstr "" + +#: ../../mod/connedit.php:349 +msgid "Hide" +msgstr "" + +#: ../../mod/connedit.php:352 +msgid "Hide or Unhide this connection" +msgstr "" + +#: ../../mod/connedit.php:359 +msgid "Delete this connection" +msgstr "" + +#: ../../mod/connedit.php:392 +msgid "Unknown" +msgstr "" + +#: ../../mod/connedit.php:402 ../../mod/connedit.php:431 +msgid "Approve this connection" +msgstr "" + +#: ../../mod/connedit.php:402 +msgid "Accept connection to allow communication" +msgstr "" + +#: ../../mod/connedit.php:418 +msgid "Automatic Permissions Settings" +msgstr "" + +#: ../../mod/connedit.php:418 +#, php-format +msgid "Connections: settings for %s" +msgstr "" + +#: ../../mod/connedit.php:422 +msgid "" +"When receiving a channel introduction, any permissions provided here will be " +"applied to the new connection automatically and the introduction approved. " +"Leave this page if you do not wish to use this feature." +msgstr "" + +#: ../../mod/connedit.php:424 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../mod/connedit.php:430 +msgid "inherited" +msgstr "" + +#: ../../mod/connedit.php:432 +msgid "Connection has no individual permissions!" +msgstr "" + +#: ../../mod/connedit.php:433 +msgid "" +"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." +msgstr "" + +#: ../../mod/connedit.php:435 +msgid "Profile Visibility" +msgstr "" + +#: ../../mod/connedit.php:436 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../mod/connedit.php:437 +msgid "Contact Information / Notes" +msgstr "" + +#: ../../mod/connedit.php:438 +msgid "Edit contact notes" +msgstr "" + +#: ../../mod/connedit.php:440 +msgid "Their Settings" +msgstr "" + +#: ../../mod/connedit.php:441 +msgid "My Settings" +msgstr "" + +#: ../../mod/connedit.php:443 +msgid "Forum Members" +msgstr "" + +#: ../../mod/connedit.php:444 +msgid "Soapbox" +msgstr "" + +#: ../../mod/connedit.php:445 +msgid "Full Sharing" +msgstr "" + +#: ../../mod/connedit.php:446 +msgid "Cautious Sharing" +msgstr "" + +#: ../../mod/connedit.php:447 +msgid "Follow Only" +msgstr "" + +#: ../../mod/connedit.php:448 +msgid "Individual Permissions" +msgstr "" + +#: ../../mod/connedit.php:449 +msgid "" +"Some permissions may be inherited from your channel privacy settings, which have higher priority. Changing those " +"inherited settings on this page will have no effect." +msgstr "" + +#: ../../mod/connedit.php:450 +msgid "Advanced Permissions" +msgstr "" + +#: ../../mod/connedit.php:451 +msgid "Quick Links" +msgstr "" + +#: ../../mod/connedit.php:455 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "" + +#: ../../mod/connedit.php:456 +msgid "Block/Unblock contact" +msgstr "" + +#: ../../mod/connedit.php:457 +msgid "Ignore contact" +msgstr "" + +#: ../../mod/connedit.php:458 +msgid "Repair URL settings" +msgstr "" + +#: ../../mod/connedit.php:459 +msgid "View conversations" +msgstr "" + +#: ../../mod/connedit.php:461 +msgid "Delete contact" +msgstr "" + +#: ../../mod/connedit.php:464 +msgid "Last update:" +msgstr "" + +#: ../../mod/connedit.php:466 +msgid "Update public posts" +msgstr "" + +#: ../../mod/connedit.php:468 +msgid "Update now" +msgstr "" + +#: ../../mod/connedit.php:474 +msgid "Currently blocked" +msgstr "" + +#: ../../mod/connedit.php:475 +msgid "Currently ignored" +msgstr "" + +#: ../../mod/connedit.php:476 +msgid "Currently archived" +msgstr "" + +#: ../../mod/connedit.php:477 +msgid "Currently pending" +msgstr "" + +#: ../../mod/connedit.php:478 +msgid "Hide this contact from others" +msgstr "" + +#: ../../mod/connedit.php:478 +msgid "" +"Replies/likes to your public posts may still be visible" msgstr "" #: ../../mod/webpages.php:121 ../../mod/layouts.php:105 @@ -3290,13 +3626,13 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:495 +#: ../../mod/api.php:105 ../../mod/profiles.php:495 ../../mod/settings.php:865 +#: ../../mod/settings.php:870 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:496 +#: ../../mod/api.php:106 ../../mod/profiles.php:496 ../../mod/settings.php:865 +#: ../../mod/settings.php:870 msgid "No" msgstr "" @@ -3312,12 +3648,12 @@ msgstr "" msgid "Invalid item." msgstr "" -#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 +#: ../../mod/page.php:47 ../../mod/chanview.php:77 ../../mod/home.php:50 #: ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "" -#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:100 +#: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100 #: ../../index.php:229 msgid "Page not found." msgstr "" @@ -3354,7 +3690,7 @@ msgid "" "phpmyadmin or mysql." msgstr "" -#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 +#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:586 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" @@ -3651,11 +3987,11 @@ msgstr "" msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/setup.php:582 +#: ../../mod/setup.php:584 msgid "

      What next

      " msgstr "" -#: ../../mod/setup.php:583 +#: ../../mod/setup.php:585 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -3675,7 +4011,7 @@ msgstr "" msgid "[Embedded content - reload page to view]" msgstr "" -#: ../../mod/chanview.php:98 +#: ../../mod/chanview.php:97 msgid "toggle full screen mode" msgstr "" @@ -3684,430 +4020,9 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/settings.php:53 -msgid "Account settings" -msgstr "" - -#: ../../mod/settings.php:59 -msgid "Channel settings" -msgstr "" - -#: ../../mod/settings.php:65 -msgid "Additional features" -msgstr "" - -#: ../../mod/settings.php:71 -msgid "Feature settings" -msgstr "" - -#: ../../mod/settings.php:77 -msgid "Display settings" -msgstr "" - -#: ../../mod/settings.php:83 -msgid "Connected apps" -msgstr "" - -#: ../../mod/settings.php:89 -msgid "Export channel" -msgstr "" - -#: ../../mod/settings.php:101 -msgid "Automatic Permissions (Advanced)" -msgstr "" - -#: ../../mod/settings.php:111 -msgid "Premium Channel Settings" -msgstr "" - -#: ../../mod/settings.php:173 -msgid "Name is required" -msgstr "" - -#: ../../mod/settings.php:177 -msgid "Key and Secret are required" -msgstr "" - -#: ../../mod/settings.php:181 ../../mod/settings.php:635 -msgid "Update" -msgstr "" - -#: ../../mod/settings.php:294 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:298 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:311 -msgid "Password changed." -msgstr "" - -#: ../../mod/settings.php:313 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../mod/settings.php:327 -msgid "Not valid email." -msgstr "" - -#: ../../mod/settings.php:330 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: ../../mod/settings.php:339 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: ../../mod/settings.php:537 -msgid "Settings updated." -msgstr "" - -#: ../../mod/settings.php:608 ../../mod/settings.php:634 -#: ../../mod/settings.php:670 -msgid "Add application" -msgstr "" - -#: ../../mod/settings.php:610 ../../mod/settings.php:636 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 -msgid "Cancel" -msgstr "" - -#: ../../mod/settings.php:611 ../../mod/settings.php:637 -#: ../../mod/admin.php:689 -msgid "Name" -msgstr "" - -#: ../../mod/settings.php:611 -msgid "Name of application" -msgstr "" - -#: ../../mod/settings.php:612 ../../mod/settings.php:638 -msgid "Consumer Key" -msgstr "" - -#: ../../mod/settings.php:612 ../../mod/settings.php:613 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../mod/settings.php:613 ../../mod/settings.php:639 -msgid "Consumer Secret" -msgstr "" - -#: ../../mod/settings.php:614 ../../mod/settings.php:640 -msgid "Redirect" -msgstr "" - -#: ../../mod/settings.php:614 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" -msgstr "" - -#: ../../mod/settings.php:615 ../../mod/settings.php:641 -msgid "Icon url" -msgstr "" - -#: ../../mod/settings.php:615 -msgid "Optional" -msgstr "" - -#: ../../mod/settings.php:626 -msgid "You can't edit this application." -msgstr "" - -#: ../../mod/settings.php:669 -msgid "Connected Apps" -msgstr "" - -#: ../../mod/settings.php:673 -msgid "Client key starts with" -msgstr "" - -#: ../../mod/settings.php:674 -msgid "No name" -msgstr "" - -#: ../../mod/settings.php:675 -msgid "Remove authorization" -msgstr "" - -#: ../../mod/settings.php:686 -msgid "No feature settings configured" -msgstr "" - -#: ../../mod/settings.php:694 -msgid "Feature Settings" -msgstr "" - -#: ../../mod/settings.php:717 -msgid "Account Settings" -msgstr "" - -#: ../../mod/settings.php:718 -msgid "Password Settings" -msgstr "" - -#: ../../mod/settings.php:719 -msgid "New Password:" -msgstr "" - -#: ../../mod/settings.php:720 -msgid "Confirm:" -msgstr "" - -#: ../../mod/settings.php:720 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: ../../mod/settings.php:722 ../../mod/settings.php:1014 -msgid "Email Address:" -msgstr "" - -#: ../../mod/settings.php:723 -msgid "Remove Account" -msgstr "" - -#: ../../mod/settings.php:724 -msgid "Warning: This action is permanent and cannot be reversed." -msgstr "" - -#: ../../mod/settings.php:740 -msgid "Off" -msgstr "" - -#: ../../mod/settings.php:740 -msgid "On" -msgstr "" - -#: ../../mod/settings.php:747 -msgid "Additional Features" -msgstr "" - -#: ../../mod/settings.php:772 -msgid "Connector Settings" -msgstr "" - -#: ../../mod/settings.php:802 ../../mod/admin.php:371 -msgid "No special theme for mobile devices" -msgstr "" - -#: ../../mod/settings.php:842 -msgid "Display Settings" -msgstr "" - -#: ../../mod/settings.php:848 -msgid "Display Theme:" -msgstr "" - -#: ../../mod/settings.php:849 -msgid "Mobile Theme:" -msgstr "" - -#: ../../mod/settings.php:850 -msgid "Update browser every xx seconds" -msgstr "" - -#: ../../mod/settings.php:850 -msgid "Minimum of 10 seconds, no maximum" -msgstr "" - -#: ../../mod/settings.php:851 -msgid "Maximum number of conversations to load at any time:" -msgstr "" - -#: ../../mod/settings.php:851 -msgid "Maximum of 100 items" -msgstr "" - -#: ../../mod/settings.php:852 -msgid "Don't show emoticons" -msgstr "" - -#: ../../mod/settings.php:888 -msgid "Nobody except yourself" -msgstr "" - -#: ../../mod/settings.php:889 -msgid "Only those you specifically allow" -msgstr "" - -#: ../../mod/settings.php:890 -msgid "Anybody in your address book" -msgstr "" - -#: ../../mod/settings.php:891 -msgid "Anybody on this website" -msgstr "" - -#: ../../mod/settings.php:892 -msgid "Anybody in this network" -msgstr "" - -#: ../../mod/settings.php:893 -msgid "Anybody on the internet" -msgstr "" - -#: ../../mod/settings.php:967 -msgid "Publish your default profile in the network directory" -msgstr "" - -#: ../../mod/settings.php:972 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: ../../mod/settings.php:976 ../../mod/profile_photo.php:288 -msgid "or" -msgstr "" - -#: ../../mod/settings.php:981 -msgid "Your channel address is" -msgstr "" - -#: ../../mod/settings.php:1003 -msgid "Channel Settings" -msgstr "" - -#: ../../mod/settings.php:1012 -msgid "Basic Settings" -msgstr "" - -#: ../../mod/settings.php:1015 -msgid "Your Timezone:" -msgstr "" - -#: ../../mod/settings.php:1016 -msgid "Default Post Location:" -msgstr "" - -#: ../../mod/settings.php:1017 -msgid "Use Browser Location:" -msgstr "" - -#: ../../mod/settings.php:1019 -msgid "Adult Content" -msgstr "" - -#: ../../mod/settings.php:1019 -msgid "This channel publishes adult content." -msgstr "" - -#: ../../mod/settings.php:1021 -msgid "Security and Privacy Settings" -msgstr "" - -#: ../../mod/settings.php:1023 -msgid "Quick Privacy Settings:" -msgstr "" - -#: ../../mod/settings.php:1024 -msgid "Very Public - extremely permissive" -msgstr "" - -#: ../../mod/settings.php:1025 -msgid "Typical - default public, privacy when desired" -msgstr "" - -#: ../../mod/settings.php:1026 -msgid "Private - default private, rarely open or public" -msgstr "" - -#: ../../mod/settings.php:1027 -msgid "Blocked - default blocked to/from everybody" -msgstr "" - -#: ../../mod/settings.php:1030 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../mod/settings.php:1030 -msgid "May reduce spam activity" -msgstr "" - -#: ../../mod/settings.php:1031 -msgid "Default Post Permissions" -msgstr "" - -#: ../../mod/settings.php:1032 ../../mod/mitem.php:137 ../../mod/mitem.php:180 -msgid "(click to open/close)" -msgstr "" - -#: ../../mod/settings.php:1043 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../mod/settings.php:1043 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../mod/settings.php:1046 -msgid "Notification Settings" -msgstr "" - -#: ../../mod/settings.php:1047 -msgid "By default post a status message when:" -msgstr "" - -#: ../../mod/settings.php:1048 -msgid "accepting a friend request" -msgstr "" - -#: ../../mod/settings.php:1049 -msgid "joining a forum/community" -msgstr "" - -#: ../../mod/settings.php:1050 -msgid "making an interesting profile change" -msgstr "" - -#: ../../mod/settings.php:1051 -msgid "Send a notification email when:" -msgstr "" - -#: ../../mod/settings.php:1052 -msgid "You receive an introduction" -msgstr "" - -#: ../../mod/settings.php:1053 -msgid "Your introductions are confirmed" -msgstr "" - -#: ../../mod/settings.php:1054 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../mod/settings.php:1055 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../mod/settings.php:1056 -msgid "You receive a private message" -msgstr "" - -#: ../../mod/settings.php:1057 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../mod/settings.php:1058 -msgid "You are tagged in a post" -msgstr "" - -#: ../../mod/settings.php:1059 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: ../../mod/settings.php:1062 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: ../../mod/settings.php:1063 -msgid "Change the behaviour of this account for special situations" -msgstr "" - #: ../../mod/viewconnections.php:17 ../../mod/search.php:80 -#: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18 -#: ../../mod/directory.php:33 +#: ../../mod/photos.php:570 ../../mod/display.php:9 ../../mod/community.php:18 +#: ../../mod/directory.php:31 msgid "Public access denied." msgstr "" @@ -4124,6 +4039,12 @@ msgstr "" msgid "View Connnections" msgstr "" +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/settings.php:508 +#: ../../mod/settings.php:534 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 +msgid "Cancel" +msgstr "" + #: ../../mod/tagrm.php:41 msgid "Tag removed" msgstr "" @@ -4218,58 +4139,62 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/sources.php:27 +#: ../../mod/sources.php:28 +msgid "Failed to create source. No channel selected." +msgstr "" + +#: ../../mod/sources.php:41 msgid "Source created." msgstr "" -#: ../../mod/sources.php:39 +#: ../../mod/sources.php:53 msgid "Source updated." msgstr "" -#: ../../mod/sources.php:68 +#: ../../mod/sources.php:82 msgid "Manage remote sources of content for your channel." msgstr "" -#: ../../mod/sources.php:69 ../../mod/sources.php:79 +#: ../../mod/sources.php:83 ../../mod/sources.php:93 msgid "New Source" msgstr "" -#: ../../mod/sources.php:80 ../../mod/sources.php:106 +#: ../../mod/sources.php:94 ../../mod/sources.php:126 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 +#: ../../mod/sources.php:95 ../../mod/sources.php:127 msgid "Only import content with these words (one per line)" msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 +#: ../../mod/sources.php:95 ../../mod/sources.php:127 msgid "Leave blank to import all public content" msgstr "" -#: ../../mod/sources.php:82 ../../mod/sources.php:109 +#: ../../mod/sources.php:96 ../../mod/sources.php:130 #: ../../mod/new_channel.php:110 msgid "Channel Name" msgstr "" -#: ../../mod/sources.php:96 ../../mod/sources.php:122 +#: ../../mod/sources.php:116 ../../mod/sources.php:143 msgid "Source not found." msgstr "" -#: ../../mod/sources.php:103 +#: ../../mod/sources.php:123 msgid "Edit Source" msgstr "" -#: ../../mod/sources.php:104 +#: ../../mod/sources.php:124 msgid "Delete Source" msgstr "" -#: ../../mod/sources.php:130 +#: ../../mod/sources.php:151 msgid "Source removed" msgstr "" -#: ../../mod/sources.php:132 +#: ../../mod/sources.php:153 msgid "Unable to remove source." msgstr "" @@ -4347,6 +4272,10 @@ msgstr "" msgid "Site settings updated." msgstr "" +#: ../../mod/admin.php:371 ../../mod/settings.php:700 +msgid "No special theme for mobile devices" +msgstr "" + #: ../../mod/admin.php:373 msgid "No special theme for accessibility" msgstr "" @@ -4680,6 +4609,11 @@ msgstr "" msgid "Request date" msgstr "" +#: ../../mod/admin.php:689 ../../mod/settings.php:509 +#: ../../mod/settings.php:535 +msgid "Name" +msgstr "" + #: ../../mod/admin.php:690 msgid "No registrations." msgstr "" @@ -4692,16 +4626,6 @@ msgstr "" msgid "Deny" msgstr "" -#: ../../mod/admin.php:694 ../../mod/connections.php:352 -#: ../../mod/connections.php:494 -msgid "Block" -msgstr "" - -#: ../../mod/admin.php:695 ../../mod/connections.php:352 -#: ../../mod/connections.php:494 -msgid "Unblock" -msgstr "" - #: ../../mod/admin.php:698 msgid "Register date" msgstr "" @@ -4869,6 +4793,10 @@ msgstr "" msgid "Menu Item Permissions" msgstr "" +#: ../../mod/mitem.php:137 ../../mod/mitem.php:180 ../../mod/settings.php:930 +msgid "(click to open/close)" +msgstr "" + #: ../../mod/mitem.php:139 ../../mod/mitem.php:183 msgid "Link text" msgstr "" @@ -4917,187 +4845,187 @@ msgstr "" msgid "Modify" msgstr "" -#: ../../mod/group.php:26 +#: ../../mod/group.php:20 msgid "Collection created." msgstr "" -#: ../../mod/group.php:32 +#: ../../mod/group.php:26 msgid "Could not create collection." msgstr "" -#: ../../mod/group.php:60 +#: ../../mod/group.php:54 msgid "Collection updated." msgstr "" -#: ../../mod/group.php:92 +#: ../../mod/group.php:86 msgid "Create a collection of channels." msgstr "" -#: ../../mod/group.php:93 ../../mod/group.php:189 +#: ../../mod/group.php:87 ../../mod/group.php:183 msgid "Collection Name: " msgstr "" -#: ../../mod/group.php:95 ../../mod/group.php:192 +#: ../../mod/group.php:89 ../../mod/group.php:186 msgid "Members are visible to other channels" msgstr "" -#: ../../mod/group.php:113 +#: ../../mod/group.php:107 msgid "Collection removed." msgstr "" -#: ../../mod/group.php:115 +#: ../../mod/group.php:109 msgid "Unable to remove collection." msgstr "" -#: ../../mod/group.php:188 +#: ../../mod/group.php:182 msgid "Collection Editor" msgstr "" -#: ../../mod/group.php:202 +#: ../../mod/group.php:196 msgid "Members" msgstr "" -#: ../../mod/group.php:204 +#: ../../mod/group.php:198 msgid "All Connected Channels" msgstr "" -#: ../../mod/group.php:237 +#: ../../mod/group.php:231 msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/photos.php:83 +#: ../../mod/photos.php:77 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/photos.php:103 +#: ../../mod/photos.php:97 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:125 ../../mod/photos.php:791 +#: ../../mod/photos.php:119 ../../mod/photos.php:787 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:165 ../../mod/photos.php:1052 +#: ../../mod/photos.php:159 ../../mod/photos.php:1048 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:510 +#: ../../mod/photos.php:504 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/photos.php:510 +#: ../../mod/photos.php:504 msgid "a photo" msgstr "" -#: ../../mod/photos.php:586 +#: ../../mod/photos.php:580 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:631 +#: ../../mod/photos.php:627 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:696 +#: ../../mod/photos.php:692 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:699 +#: ../../mod/photos.php:695 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:718 +#: ../../mod/photos.php:714 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:722 ../../mod/photos.php:786 +#: ../../mod/photos.php:718 ../../mod/photos.php:782 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:723 +#: ../../mod/photos.php:719 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:724 +#: ../../mod/photos.php:720 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:726 ../../mod/photos.php:1047 +#: ../../mod/photos.php:722 ../../mod/photos.php:1043 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:775 ../../mod/photos.php:797 ../../mod/photos.php:1223 -#: ../../mod/photos.php:1238 +#: ../../mod/photos.php:771 ../../mod/photos.php:793 ../../mod/photos.php:1219 +#: ../../mod/photos.php:1234 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:801 +#: ../../mod/photos.php:797 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:807 +#: ../../mod/photos.php:803 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:809 +#: ../../mod/photos.php:805 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:853 ../../mod/photos.php:1270 +#: ../../mod/photos.php:849 ../../mod/photos.php:1266 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:897 +#: ../../mod/photos.php:893 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:899 +#: ../../mod/photos.php:895 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:957 +#: ../../mod/photos.php:953 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:981 +#: ../../mod/photos.php:977 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1035 +#: ../../mod/photos.php:1031 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1037 +#: ../../mod/photos.php:1033 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1038 +#: ../../mod/photos.php:1034 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1040 +#: ../../mod/photos.php:1036 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1043 +#: ../../mod/photos.php:1039 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1045 +#: ../../mod/photos.php:1041 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1049 +#: ../../mod/photos.php:1045 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1276 +#: ../../mod/photos.php:1272 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1281 msgid "Recent Photos" msgstr "" @@ -5193,101 +5121,174 @@ msgstr "" msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/home.php:76 +#: ../../mod/home.php:89 #, php-format msgid "Welcome to %s" msgstr "" -#: ../../mod/message.php:19 -msgid "Check Mail" -msgstr "" - -#: ../../mod/message.php:56 +#: ../../mod/message.php:33 msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/message.php:64 +#: ../../mod/message.php:41 msgid "Unable to communicate with requested channel." msgstr "" -#: ../../mod/message.php:71 +#: ../../mod/message.php:48 msgid "Cannot verify requested channel." msgstr "" -#: ../../mod/message.php:97 +#: ../../mod/message.php:74 msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/message.php:223 +#: ../../mod/message.php:200 msgid "Messages" msgstr "" -#: ../../mod/message.php:234 +#: ../../mod/message.php:211 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:241 +#: ../../mod/message.php:218 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:258 +#: ../../mod/message.php:235 msgid "Message recalled." msgstr "" -#: ../../mod/message.php:316 +#: ../../mod/message.php:293 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:317 ../../mod/message.php:471 +#: ../../mod/message.php:294 ../../mod/message.php:447 msgid "To:" msgstr "" -#: ../../mod/message.php:322 ../../mod/message.php:473 +#: ../../mod/message.php:299 ../../mod/message.php:449 msgid "Subject:" msgstr "" -#: ../../mod/message.php:359 +#: ../../mod/message.php:336 msgid "No messages." msgstr "" -#: ../../mod/message.php:375 ../../mod/message.php:440 +#: ../../mod/message.php:352 ../../mod/message.php:416 msgid "Delete message" msgstr "" -#: ../../mod/message.php:377 +#: ../../mod/message.php:354 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:396 +#: ../../mod/message.php:373 msgid "Message not found." msgstr "" -#: ../../mod/message.php:441 +#: ../../mod/message.php:417 msgid "Recall message" msgstr "" -#: ../../mod/message.php:443 +#: ../../mod/message.php:419 msgid "Message has been recalled." msgstr "" -#: ../../mod/message.php:460 +#: ../../mod/message.php:436 msgid "Private Conversation" msgstr "" -#: ../../mod/message.php:464 +#: ../../mod/message.php:440 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:466 +#: ../../mod/message.php:442 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:470 +#: ../../mod/message.php:446 msgid "Send Reply" msgstr "" +#: ../../mod/connections.php:189 ../../mod/connections.php:261 +msgid "Blocked" +msgstr "" + +#: ../../mod/connections.php:194 ../../mod/connections.php:268 +msgid "Ignored" +msgstr "" + +#: ../../mod/connections.php:199 ../../mod/connections.php:282 +msgid "Hidden" +msgstr "" + +#: ../../mod/connections.php:204 ../../mod/connections.php:275 +msgid "Archived" +msgstr "" + +#: ../../mod/connections.php:215 +msgid "All" +msgstr "" + +#: ../../mod/connections.php:239 +msgid "Suggest new connections" +msgstr "" + +#: ../../mod/connections.php:245 +msgid "Show pending (new) connections" +msgstr "" + +#: ../../mod/connections.php:248 +msgid "All Connections" +msgstr "" + +#: ../../mod/connections.php:251 +msgid "Show all connections" +msgstr "" + +#: ../../mod/connections.php:254 +msgid "Unblocked" +msgstr "" + +#: ../../mod/connections.php:257 +msgid "Only show unblocked connections" +msgstr "" + +#: ../../mod/connections.php:264 +msgid "Only show blocked connections" +msgstr "" + +#: ../../mod/connections.php:271 +msgid "Only show ignored connections" +msgstr "" + +#: ../../mod/connections.php:278 +msgid "Only show archived connections" +msgstr "" + +#: ../../mod/connections.php:285 +msgid "Only show hidden connections" +msgstr "" + +#: ../../mod/connections.php:329 +#, php-format +msgid "%1$s [%2$s]" +msgstr "" + +#: ../../mod/connections.php:330 +msgid "Edit contact" +msgstr "" + +#: ../../mod/connections.php:353 +msgid "Search your connections" +msgstr "" + +#: ../../mod/connections.php:354 +msgid "Finding: " +msgstr "" + #: ../../mod/layouts.php:52 msgid "Layout Help" msgstr "" @@ -5300,11 +5301,11 @@ msgstr "" msgid "Layout Name" msgstr "" -#: ../../mod/help.php:41 +#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 msgid "Help:" msgstr "" -#: ../../mod/help.php:53 ../../index.php:226 +#: ../../mod/help.php:68 ../../index.php:226 msgid "Not Found" msgstr "" @@ -5344,6 +5345,10 @@ msgstr "" msgid "Invalid connection." msgstr "" +#: ../../mod/follow.php:25 +msgid "Channel added." +msgstr "" + #: ../../mod/post.php:222 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " @@ -5367,7 +5372,7 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../mod/magic.php:63 +#: ../../mod/magic.php:70 msgid "Hub not found." msgstr "" @@ -5607,7 +5612,7 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:573 ../../mod/directory.php:161 +#: ../../mod/profiles.php:573 ../../mod/directory.php:159 msgid "Age: " msgstr "" @@ -5648,397 +5653,6 @@ msgid "" "Or import an existing channel from another location" msgstr "" -#: ../../mod/connections.php:71 -msgid "Could not access contact record." -msgstr "" - -#: ../../mod/connections.php:85 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/connections.php:126 -msgid "Connection updated." -msgstr "" - -#: ../../mod/connections.php:128 -msgid "Failed to update connection record." -msgstr "" - -#: ../../mod/connections.php:223 -msgid "Could not access address book record." -msgstr "" - -#: ../../mod/connections.php:237 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../mod/connections.php:244 -msgid "Channel has been unblocked" -msgstr "" - -#: ../../mod/connections.php:245 -msgid "Channel has been blocked" -msgstr "" - -#: ../../mod/connections.php:249 ../../mod/connections.php:261 -#: ../../mod/connections.php:273 ../../mod/connections.php:285 -#: ../../mod/connections.php:300 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../mod/connections.php:256 -msgid "Channel has been unignored" -msgstr "" - -#: ../../mod/connections.php:257 -msgid "Channel has been ignored" -msgstr "" - -#: ../../mod/connections.php:268 -msgid "Channel has been unarchived" -msgstr "" - -#: ../../mod/connections.php:269 -msgid "Channel has been archived" -msgstr "" - -#: ../../mod/connections.php:280 -msgid "Channel has been unhidden" -msgstr "" - -#: ../../mod/connections.php:281 -msgid "Channel has been hidden" -msgstr "" - -#: ../../mod/connections.php:295 -msgid "Channel has been approved" -msgstr "" - -#: ../../mod/connections.php:296 -msgid "Channel has been unapproved" -msgstr "" - -#: ../../mod/connections.php:314 -msgid "Contact has been removed." -msgstr "" - -#: ../../mod/connections.php:334 -#, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../mod/connections.php:338 -msgid "Refresh Permissions" -msgstr "" - -#: ../../mod/connections.php:341 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../mod/connections.php:345 -msgid "Recent Activity" -msgstr "" - -#: ../../mod/connections.php:348 -msgid "View recent posts and comments" -msgstr "" - -#: ../../mod/connections.php:355 -msgid "Block or Unblock this connection" -msgstr "" - -#: ../../mod/connections.php:359 ../../mod/connections.php:495 -msgid "Unignore" -msgstr "" - -#: ../../mod/connections.php:359 ../../mod/connections.php:495 -#: ../../mod/notifications.php:51 -msgid "Ignore" -msgstr "" - -#: ../../mod/connections.php:362 -msgid "Ignore or Unignore this connection" -msgstr "" - -#: ../../mod/connections.php:365 -msgid "Unarchive" -msgstr "" - -#: ../../mod/connections.php:365 -msgid "Archive" -msgstr "" - -#: ../../mod/connections.php:368 -msgid "Archive or Unarchive this connection" -msgstr "" - -#: ../../mod/connections.php:371 -msgid "Unhide" -msgstr "" - -#: ../../mod/connections.php:371 -msgid "Hide" -msgstr "" - -#: ../../mod/connections.php:374 -msgid "Hide or Unhide this connection" -msgstr "" - -#: ../../mod/connections.php:381 -msgid "Delete this connection" -msgstr "" - -#: ../../mod/connections.php:414 -msgid "Unknown" -msgstr "" - -#: ../../mod/connections.php:424 ../../mod/connections.php:453 -msgid "Approve this connection" -msgstr "" - -#: ../../mod/connections.php:424 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../mod/connections.php:440 -msgid "Automatic Permissions Settings" -msgstr "" - -#: ../../mod/connections.php:440 -#, php-format -msgid "Connections: settings for %s" -msgstr "" - -#: ../../mod/connections.php:444 -msgid "" -"When receiving a channel introduction, any permissions provided here will be " -"applied to the new connection automatically and the introduction approved. " -"Leave this page if you do not wish to use this feature." -msgstr "" - -#: ../../mod/connections.php:446 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../mod/connections.php:452 -msgid "inherited" -msgstr "" - -#: ../../mod/connections.php:454 -msgid "Connection has no individual permissions!" -msgstr "" - -#: ../../mod/connections.php:455 -msgid "" -"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "" - -#: ../../mod/connections.php:457 -msgid "Profile Visibility" -msgstr "" - -#: ../../mod/connections.php:458 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: ../../mod/connections.php:459 -msgid "Contact Information / Notes" -msgstr "" - -#: ../../mod/connections.php:460 -msgid "Edit contact notes" -msgstr "" - -#: ../../mod/connections.php:462 -msgid "Their Settings" -msgstr "" - -#: ../../mod/connections.php:463 -msgid "My Settings" -msgstr "" - -#: ../../mod/connections.php:465 -msgid "Forum Members" -msgstr "" - -#: ../../mod/connections.php:466 -msgid "Soapbox" -msgstr "" - -#: ../../mod/connections.php:467 -msgid "Full Sharing" -msgstr "" - -#: ../../mod/connections.php:468 -msgid "Cautious Sharing" -msgstr "" - -#: ../../mod/connections.php:469 -msgid "Follow Only" -msgstr "" - -#: ../../mod/connections.php:470 -msgid "Individual Permissions" -msgstr "" - -#: ../../mod/connections.php:471 -msgid "" -"Some permissions may be inherited from your channel privacy settings, which have higher priority. Changing those " -"inherited settings on this page will have no effect." -msgstr "" - -#: ../../mod/connections.php:472 -msgid "Advanced Permissions" -msgstr "" - -#: ../../mod/connections.php:473 -msgid "Quick Links" -msgstr "" - -#: ../../mod/connections.php:477 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "" - -#: ../../mod/connections.php:478 -msgid "Block/Unblock contact" -msgstr "" - -#: ../../mod/connections.php:479 -msgid "Ignore contact" -msgstr "" - -#: ../../mod/connections.php:480 -msgid "Repair URL settings" -msgstr "" - -#: ../../mod/connections.php:481 -msgid "View conversations" -msgstr "" - -#: ../../mod/connections.php:483 -msgid "Delete contact" -msgstr "" - -#: ../../mod/connections.php:486 -msgid "Last update:" -msgstr "" - -#: ../../mod/connections.php:488 -msgid "Update public posts" -msgstr "" - -#: ../../mod/connections.php:490 -msgid "Update now" -msgstr "" - -#: ../../mod/connections.php:496 -msgid "Currently blocked" -msgstr "" - -#: ../../mod/connections.php:497 -msgid "Currently ignored" -msgstr "" - -#: ../../mod/connections.php:498 -msgid "Currently archived" -msgstr "" - -#: ../../mod/connections.php:499 -msgid "Currently pending" -msgstr "" - -#: ../../mod/connections.php:500 -msgid "Hide this contact from others" -msgstr "" - -#: ../../mod/connections.php:500 -msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "" - -#: ../../mod/connections.php:536 ../../mod/connections.php:608 -msgid "Blocked" -msgstr "" - -#: ../../mod/connections.php:541 ../../mod/connections.php:615 -msgid "Ignored" -msgstr "" - -#: ../../mod/connections.php:546 ../../mod/connections.php:629 -msgid "Hidden" -msgstr "" - -#: ../../mod/connections.php:551 ../../mod/connections.php:622 -msgid "Archived" -msgstr "" - -#: ../../mod/connections.php:562 -msgid "All" -msgstr "" - -#: ../../mod/connections.php:586 -msgid "Suggest new connections" -msgstr "" - -#: ../../mod/connections.php:592 -msgid "Show pending (new) connections" -msgstr "" - -#: ../../mod/connections.php:595 -msgid "All Connections" -msgstr "" - -#: ../../mod/connections.php:598 -msgid "Show all connections" -msgstr "" - -#: ../../mod/connections.php:601 -msgid "Unblocked" -msgstr "" - -#: ../../mod/connections.php:604 -msgid "Only show unblocked connections" -msgstr "" - -#: ../../mod/connections.php:611 -msgid "Only show blocked connections" -msgstr "" - -#: ../../mod/connections.php:618 -msgid "Only show ignored connections" -msgstr "" - -#: ../../mod/connections.php:625 -msgid "Only show archived connections" -msgstr "" - -#: ../../mod/connections.php:632 -msgid "Only show hidden connections" -msgstr "" - -#: ../../mod/connections.php:674 -#, php-format -msgid "%1$s [%2$s]" -msgstr "" - -#: ../../mod/connections.php:675 -msgid "Edit contact" -msgstr "" - -#: ../../mod/connections.php:698 -msgid "Search your connections" -msgstr "" - -#: ../../mod/connections.php:699 -msgid "Finding: " -msgstr "" - #: ../../mod/filestorage.php:35 msgid "Permission Denied." msgstr "" @@ -6083,7 +5697,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1450 +#: ../../mod/lostpass.php:85 ../../boot.php:1426 msgid "Password Reset" msgstr "" @@ -6266,8 +5880,370 @@ msgstr "" msgid "invalid target signature" msgstr "" -#: ../../mod/follow.php:25 -msgid "Channel added." +#: ../../mod/settings.php:71 +msgid "Name is required" +msgstr "" + +#: ../../mod/settings.php:75 +msgid "Key and Secret are required" +msgstr "" + +#: ../../mod/settings.php:79 ../../mod/settings.php:533 +msgid "Update" +msgstr "" + +#: ../../mod/settings.php:192 +msgid "Passwords do not match. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:196 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:209 +msgid "Password changed." +msgstr "" + +#: ../../mod/settings.php:211 +msgid "Password update failed. Please try again." +msgstr "" + +#: ../../mod/settings.php:225 +msgid "Not valid email." +msgstr "" + +#: ../../mod/settings.php:228 +msgid "Protected email address. Cannot change to that email." +msgstr "" + +#: ../../mod/settings.php:237 +msgid "System failure storing new email. Please try again." +msgstr "" + +#: ../../mod/settings.php:435 +msgid "Settings updated." +msgstr "" + +#: ../../mod/settings.php:506 ../../mod/settings.php:532 +#: ../../mod/settings.php:568 +msgid "Add application" +msgstr "" + +#: ../../mod/settings.php:509 +msgid "Name of application" +msgstr "" + +#: ../../mod/settings.php:510 ../../mod/settings.php:536 +msgid "Consumer Key" +msgstr "" + +#: ../../mod/settings.php:510 ../../mod/settings.php:511 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "" + +#: ../../mod/settings.php:511 ../../mod/settings.php:537 +msgid "Consumer Secret" +msgstr "" + +#: ../../mod/settings.php:512 ../../mod/settings.php:538 +msgid "Redirect" +msgstr "" + +#: ../../mod/settings.php:512 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" +msgstr "" + +#: ../../mod/settings.php:513 ../../mod/settings.php:539 +msgid "Icon url" +msgstr "" + +#: ../../mod/settings.php:513 +msgid "Optional" +msgstr "" + +#: ../../mod/settings.php:524 +msgid "You can't edit this application." +msgstr "" + +#: ../../mod/settings.php:567 +msgid "Connected Apps" +msgstr "" + +#: ../../mod/settings.php:571 +msgid "Client key starts with" +msgstr "" + +#: ../../mod/settings.php:572 +msgid "No name" +msgstr "" + +#: ../../mod/settings.php:573 +msgid "Remove authorization" +msgstr "" + +#: ../../mod/settings.php:584 +msgid "No feature settings configured" +msgstr "" + +#: ../../mod/settings.php:592 +msgid "Feature Settings" +msgstr "" + +#: ../../mod/settings.php:615 +msgid "Account Settings" +msgstr "" + +#: ../../mod/settings.php:616 +msgid "Password Settings" +msgstr "" + +#: ../../mod/settings.php:617 +msgid "New Password:" +msgstr "" + +#: ../../mod/settings.php:618 +msgid "Confirm:" +msgstr "" + +#: ../../mod/settings.php:618 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../mod/settings.php:620 ../../mod/settings.php:912 +msgid "Email Address:" +msgstr "" + +#: ../../mod/settings.php:621 +msgid "Remove Account" +msgstr "" + +#: ../../mod/settings.php:622 +msgid "Warning: This action is permanent and cannot be reversed." +msgstr "" + +#: ../../mod/settings.php:638 +msgid "Off" +msgstr "" + +#: ../../mod/settings.php:638 +msgid "On" +msgstr "" + +#: ../../mod/settings.php:645 +msgid "Additional Features" +msgstr "" + +#: ../../mod/settings.php:670 +msgid "Connector Settings" +msgstr "" + +#: ../../mod/settings.php:740 +msgid "Display Settings" +msgstr "" + +#: ../../mod/settings.php:746 +msgid "Display Theme:" +msgstr "" + +#: ../../mod/settings.php:747 +msgid "Mobile Theme:" +msgstr "" + +#: ../../mod/settings.php:748 +msgid "Update browser every xx seconds" +msgstr "" + +#: ../../mod/settings.php:748 +msgid "Minimum of 10 seconds, no maximum" +msgstr "" + +#: ../../mod/settings.php:749 +msgid "Maximum number of conversations to load at any time:" +msgstr "" + +#: ../../mod/settings.php:749 +msgid "Maximum of 100 items" +msgstr "" + +#: ../../mod/settings.php:750 +msgid "Don't show emoticons" +msgstr "" + +#: ../../mod/settings.php:786 +msgid "Nobody except yourself" +msgstr "" + +#: ../../mod/settings.php:787 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../mod/settings.php:788 +msgid "Anybody in your address book" +msgstr "" + +#: ../../mod/settings.php:789 +msgid "Anybody on this website" +msgstr "" + +#: ../../mod/settings.php:790 +msgid "Anybody in this network" +msgstr "" + +#: ../../mod/settings.php:791 +msgid "Anybody on the internet" +msgstr "" + +#: ../../mod/settings.php:865 +msgid "Publish your default profile in the network directory" +msgstr "" + +#: ../../mod/settings.php:870 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: ../../mod/settings.php:874 ../../mod/profile_photo.php:288 +msgid "or" +msgstr "" + +#: ../../mod/settings.php:879 +msgid "Your channel address is" +msgstr "" + +#: ../../mod/settings.php:901 +msgid "Channel Settings" +msgstr "" + +#: ../../mod/settings.php:910 +msgid "Basic Settings" +msgstr "" + +#: ../../mod/settings.php:913 +msgid "Your Timezone:" +msgstr "" + +#: ../../mod/settings.php:914 +msgid "Default Post Location:" +msgstr "" + +#: ../../mod/settings.php:915 +msgid "Use Browser Location:" +msgstr "" + +#: ../../mod/settings.php:917 +msgid "Adult Content" +msgstr "" + +#: ../../mod/settings.php:917 +msgid "This channel publishes adult content." +msgstr "" + +#: ../../mod/settings.php:919 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:921 +msgid "Quick Privacy Settings:" +msgstr "" + +#: ../../mod/settings.php:922 +msgid "Very Public - extremely permissive" +msgstr "" + +#: ../../mod/settings.php:923 +msgid "Typical - default public, privacy when desired" +msgstr "" + +#: ../../mod/settings.php:924 +msgid "Private - default private, rarely open or public" +msgstr "" + +#: ../../mod/settings.php:925 +msgid "Blocked - default blocked to/from everybody" +msgstr "" + +#: ../../mod/settings.php:928 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:928 +msgid "May reduce spam activity" +msgstr "" + +#: ../../mod/settings.php:929 +msgid "Default Post Permissions" +msgstr "" + +#: ../../mod/settings.php:941 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: ../../mod/settings.php:941 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../mod/settings.php:944 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:945 +msgid "By default post a status message when:" +msgstr "" + +#: ../../mod/settings.php:946 +msgid "accepting a friend request" +msgstr "" + +#: ../../mod/settings.php:947 +msgid "joining a forum/community" +msgstr "" + +#: ../../mod/settings.php:948 +msgid "making an interesting profile change" +msgstr "" + +#: ../../mod/settings.php:949 +msgid "Send a notification email when:" +msgstr "" + +#: ../../mod/settings.php:950 +msgid "You receive an introduction" +msgstr "" + +#: ../../mod/settings.php:951 +msgid "Your introductions are confirmed" +msgstr "" + +#: ../../mod/settings.php:952 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../mod/settings.php:953 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../mod/settings.php:954 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:955 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../mod/settings.php:956 +msgid "You are tagged in a post" +msgstr "" + +#: ../../mod/settings.php:957 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../mod/settings.php:960 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: ../../mod/settings.php:961 +msgid "Change the behaviour of this account for special situations" msgstr "" #: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:32 @@ -6537,50 +6513,50 @@ msgstr "" msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/siteinfo.php:51 +#: ../../mod/siteinfo.php:57 #, php-format msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:65 +#: ../../mod/siteinfo.php:76 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:78 +#: ../../mod/siteinfo.php:89 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:81 +#: ../../mod/siteinfo.php:92 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:82 +#: ../../mod/siteinfo.php:93 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralised privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:84 +#: ../../mod/siteinfo.php:96 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:85 +#: ../../mod/siteinfo.php:97 msgid "" "Please visit GetZot.com to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:86 +#: ../../mod/siteinfo.php:98 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:89 +#: ../../mod/siteinfo.php:101 msgid "" "Suggestions, praise, donations, etc. - please email \"redmatrix\" at " "librelist - dot com" msgstr "" -#: ../../mod/suggest.php:42 +#: ../../mod/suggest.php:35 msgid "" "No suggestions available. If this is a new site, please try again in 24 " "hours." @@ -6709,23 +6685,23 @@ msgstr "" msgid "Remove My Account" msgstr "" -#: ../../mod/directory.php:164 +#: ../../mod/directory.php:162 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:225 +#: ../../mod/directory.php:223 msgid "Finding:" msgstr "" -#: ../../mod/directory.php:233 +#: ../../mod/directory.php:231 msgid "next page" msgstr "" -#: ../../mod/directory.php:233 +#: ../../mod/directory.php:231 msgid "previous page" msgstr "" -#: ../../mod/directory.php:240 +#: ../../mod/directory.php:238 msgid "No entries (some entries may be hidden)." msgstr "" @@ -6982,41 +6958,41 @@ msgstr "" msgid "Header image only on profile pages" msgstr "" -#: ../../boot.php:1255 +#: ../../boot.php:1224 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1258 +#: ../../boot.php:1227 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1415 +#: ../../boot.php:1391 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1443 +#: ../../boot.php:1419 msgid "Password" msgstr "" -#: ../../boot.php:1444 +#: ../../boot.php:1420 msgid "Remember me" msgstr "" -#: ../../boot.php:1449 +#: ../../boot.php:1425 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1514 +#: ../../boot.php:1490 msgid "permission denied" msgstr "" -#: ../../boot.php:1515 +#: ../../boot.php:1491 msgid "Got Zot?" msgstr "" -#: ../../boot.php:1907 +#: ../../boot.php:1887 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 8ba637b20..81076cbc3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-19.531 +2013-12-20.532 diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl new file mode 100644 index 000000000..7de4a270f --- /dev/null +++ b/view/pdl/mod_search.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=savedsearch][/widget] +[/region] From aa312f72bf48f3ffeb62606541b39e5243ce819e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 20 Dec 2013 12:43:04 -0800 Subject: [PATCH 21/24] comanchify mod_directory. Two modules remaining. Actually three because message needs to be split. --- doc/bbcode.html | 2 +- include/taxonomy.php | 19 +++++++++++-------- include/widgets.php | 19 +++++++++++++++++++ mod/directory.php | 10 ++++++---- view/pdl/mod_directory.pdl | 7 +++++++ 5 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 view/pdl/mod_directory.pdl diff --git a/doc/bbcode.html b/doc/bbcode.html index 7183f50c1..a24dd8b5d 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -7,7 +7,7 @@
    • [u]underlined[/u] - underlined
    • [s]strike[/s] - strike
    • [color=red]red[/color] - red
      -
    • [url=https://www.redmatrix.me]Red Matrix[/url] Red Matrix
      +
    • [url=https://redmatrix.me]Red Matrix[/url] Red Matrix
    • [img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    • [code]code[/code] code
    • [quote]quote[/quote]
      quote

      diff --git a/include/taxonomy.php b/include/taxonomy.php index 65d082bb0..7887f7687 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -217,16 +217,19 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$restrict = 0,$ } function dir_tagblock($link,$r) { - $o = ''; - $tab = 0; + $o = ''; + $tab = 0; - if($r) { - $o = '

      ' . t('Keywords') . '

      '; - foreach($r as $rr) { - $o .= ''.$rr['term'].' ' . "\r\n"; + if(! $r) + $r = get_app()->data['directory_keywords']; + + if($r) { + $o = '

      ' . t('Keywords') . '

      '; + foreach($r as $rr) { + $o .= ''.$rr['term'].' ' . "\r\n"; + } + $o .= '
      '; } - $o .= '
      '; - } return $o; } diff --git a/include/widgets.php b/include/widgets.php index 2591a9d09..5e2285de7 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1,5 +1,8 @@ get_observer()); } + +/** + * The following directory widgets are only useful on the directory page + */ + +function widget_dirsafemode($arr) { + return dir_safe_mode(); +} + +function widget_dirsort($arr) { + return dir_sort_links(); +} + +function widget_dirtags($arr) { + return dir_tagblock(z_root() . '/directory',null); +} \ No newline at end of file diff --git a/mod/directory.php b/mod/directory.php index 92fb36ea7..c5495bc01 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -8,7 +8,7 @@ function directory_init(&$a) { $a->set_pager_itemspage(80); } - +/* function directory_aside(&$a) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { @@ -23,7 +23,7 @@ function directory_aside(&$a) { $a->set_widget('dir_sort_order',dir_sort_links()); } - +*/ function directory_content(&$a) { @@ -210,9 +210,11 @@ function directory_content(&$a) { } if($j['keywords']) { - $a->set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords'])); + $a->data['directory_keywords'] = $j['keywords']; + +// $a->set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords'])); } - $a->set_widget('suggest',widget_suggestions(array())); +// $a->set_widget('suggest',widget_suggestions(array())); // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); diff --git a/view/pdl/mod_directory.pdl b/view/pdl/mod_directory.pdl new file mode 100644 index 000000000..0bc8ed936 --- /dev/null +++ b/view/pdl/mod_directory.pdl @@ -0,0 +1,7 @@ +[region=aside] +[widget=findpeople][/widget] +[widget=dirsafemode][/widget] +[widget=dirsort][/widget] +[widget=dirtags][/widget] +[widget=suggestions][/widget] +[/region] From d32bbaf599c77aa415ee403a896b77f091f0e9fc Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 21 Dec 2013 23:47:44 -0800 Subject: [PATCH 22/24] split private messages into two modules - "message" is just for message lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly. --- include/conversation.php | 2 +- include/dir_fns.php | 4 +- include/enotify.php | 4 +- include/nav.php | 2 +- include/widgets.php | 2 +- mod/directory.php | 20 -- mod/message.php | 398 +-------------------------------------- mod/ping.php | 2 +- version.inc | 2 +- view/css/mod_mail.css | 100 ++++++++++ view/js/mod_mail.js | 13 ++ view/pdl/mod_mail.pdl | 3 + view/tpl/mail_conv.tpl | 4 +- view/tpl/mail_list.tpl | 2 +- view/tpl/prv_message.tpl | 2 +- 15 files changed, 133 insertions(+), 427 deletions(-) create mode 100644 view/css/mod_mail.css create mode 100644 view/js/mod_mail.js create mode 100644 view/pdl/mod_mail.pdl diff --git a/include/conversation.php b/include/conversation.php index 2ba3948bf..0bb13a17e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -908,7 +908,7 @@ function item_photo_menu($item){ } $profile_link = z_root() . "/chanview/?f=&hash=" . $item['author_xchan']; - $pm_url = $a->get_baseurl($ssl_state) . '/message/new/?f=&hash=' . $item['author_xchan']; + $pm_url = $a->get_baseurl($ssl_state) . '/mail/new/?f=&hash=' . $item['author_xchan']; if($a->contacts && array_key_exists($item['author_xchan'],$a->contacts)) $contact = $a->contacts[$item['author_xchan']]; diff --git a/include/dir_fns.php b/include/dir_fns.php index 02e8186b7..823763e63 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -22,8 +22,8 @@ function dir_sort_links() { function dir_safe_mode() { $observer = get_observer_hash(); -if (! $observer) - return; + if (! $observer) + return; if ($observer) $safe_mode = get_xconfig($observer,'directory','safe_mode'); if($safe_mode === '0') diff --git a/include/enotify.php b/include/enotify.php index 1ab6e7dfb..49d690511 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -86,8 +86,8 @@ function notification($params) { $preamble = sprintf( t('%1$s, %2$s sent you a new private message at %3$s.'),$recip['channel_name'], $sender['xchan_name'],$sitename); $epreamble = sprintf( t('%1$s sent you %2$s.'),'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]'); $sitelink = t('Please visit %s to view and/or reply to your private messages.'); - $tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $tsitelink = sprintf( $sitelink, $siteurl . '/mail/' . $params['item']['id'] ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); $itemlink = $siteurl . '/message/' . $params['item']['id']; } diff --git a/include/nav.php b/include/nav.php index 7e99c782e..008899c47 100644 --- a/include/nav.php +++ b/include/nav.php @@ -165,7 +165,7 @@ EOT; $nav['messages']['mark'] = array('', t('Mark all private messages seen'), '',''); $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox')); $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox')); - $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message')); + $nav['messages']['new'] = array('mail/new', t('New Message'), "", t('New Message')); $nav['all_events'] = array('events', t('Events'), "", t('Event Calendar')); diff --git a/include/widgets.php b/include/widgets.php index 5e2285de7..d6ef9ec07 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -507,7 +507,7 @@ function widget_mailmenu($arr) { ), '$new'=>array( 'label' => t('New Message'), - 'url' => $a->get_baseurl(true) . '/message/new', + 'url' => $a->get_baseurl(true) . '/mail/new', 'sel'=> (argv(1) == 'new'), ) diff --git a/mod/directory.php b/mod/directory.php index c5495bc01..9e4c37fae 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -8,22 +8,6 @@ function directory_init(&$a) { $a->set_pager_itemspage(80); } -/* -function directory_aside(&$a) { - - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - return; - } - - require_once('include/contact_widgets.php'); - $a->set_widget('find_people',findpeople_widget()); - - $a->set_widget('safe_search',dir_safe_mode()); - - $a->set_widget('dir_sort_order',dir_sort_links()); - -} -*/ function directory_content(&$a) { @@ -211,11 +195,7 @@ function directory_content(&$a) { if($j['keywords']) { $a->data['directory_keywords'] = $j['keywords']; - -// $a->set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords'])); } -// $a->set_widget('suggest',widget_suggestions(array())); - // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); diff --git a/mod/message.php b/mod/message.php index 8bb9a6ee7..c14bf2161 100644 --- a/mod/message.php +++ b/mod/message.php @@ -7,175 +7,6 @@ require_once("include/bbcode.php"); require_once('include/Contact.php'); -function message_post(&$a) { - - if(! local_user()) - return; - - $replyto = ((x($_REQUEST,'replyto')) ? notags(trim($_REQUEST['replyto'])) : ''); - $subject = ((x($_REQUEST,'subject')) ? notags(trim($_REQUEST['subject'])) : ''); - $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : ''); - $recipient = ((x($_REQUEST,'messageto')) ? notags(trim($_REQUEST['messageto'])) : ''); - $rstr = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : ''); - $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : '0000-00-00 00:00:00'); - - // If we have a raw string for a recipient which hasn't been auto-filled, - // it means they probably aren't in our address book, hence we don't know - // if we have permission to send them private messages. - // finger them and find out before we try and send it. - - if(! $recipient) { - $channel = $a->get_channel(); - - $ret = zot_finger($rstr,$channel); - - if(! $ret['success']) { - notice( t('Unable to lookup recipient.') . EOL); - return; - } - $j = json_decode($ret['body'],true); - - logger('message_post: lookup: ' . $url . ' ' . print_r($j,true)); - - if(! ($j['success'] && $j['guid'])) { - notice( t('Unable to communicate with requested channel.')); - return; - } - - $x = import_xchan($j); - - if(! $x['success']) { - notice( t('Cannot verify requested channel.')); - return; - } - - $recipient = $x['hash']; - - $their_perms = 0; - - $global_perms = get_perms(); - - if($j['permissions']['data']) { - $permissions = crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']); - if($permissions) - $permissions = json_decode($permissions); - logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA); - } - else - $permissions = $j['permissions']; - - foreach($permissions as $k => $v) { - if($v) { - $their_perms = $their_perms | intval($global_perms[$k][1]); - } - } - - if(! ($their_perms & PERMS_W_MAIL)) { - notice( t('Selected channel has private message restrictions. Send failed.')); - return; - } - } - - if(feature_enabled(local_user(),'richtext')) { - $body = fix_mce_lf($body); - } - - if(! $recipient) { - notice('No recipient found.'); - $a->argc = 2; - $a->argv[1] = 'new'; - return; - } - - // We have a local_user, let send_message use the session channel and save a lookup - - $ret = send_message(0, $recipient, $body, $subject, $replyto, $expires); - - if(! $ret['success']) { - notice($ret['message']); - } - -} - -// Note: the code in 'item_extract_images' and 'item_redir_and_replace_images' -// is identical to the code in include/conversation.php -if(! function_exists('item_extract_images')) { -function item_extract_images($body) { - - $saved_image = array(); - $orig_body = $body; - $new_body = ''; - - $cnt = 0; - $img_start = strpos($orig_body, '[img'); - $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); - $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - while(($img_st_close !== false) && ($img_end !== false)) { - - $img_st_close++; // make it point to AFTER the closing bracket - $img_end += $img_start; - - if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { - // This is an embedded image - - $saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close)); - $new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]'; - - $cnt++; - } - else - $new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]')); - - $orig_body = substr($orig_body, $img_end + strlen('[/img]')); - - if($orig_body === false) // in case the body ends on a closing image tag - $orig_body = ''; - - $img_start = strpos($orig_body, '[img'); - $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); - $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); - } - - $new_body = $new_body . $orig_body; - - return array('body' => $new_body, 'images' => $saved_image); -}} - -if(! function_exists('item_redir_and_replace_images')) { -function item_redir_and_replace_images($body, $images, $cid) { - - $origbody = $body; - $newbody = ''; - - for($i = 0; $i < count($images); $i++) { - $search = '/\[zrl\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/zrl\]' . '/is'; -//FIXME - $replace = '[zrl=' . z_path() . '/redir/' . $cid - . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/zrl]' ; - - $img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]'); - $process_part = substr($origbody, 0, $img_end); - $origbody = substr($origbody, $img_end); - - $process_part = preg_replace($search, $replace, $process_part); - $newbody = $newbody . $process_part; - } - $newbody = $newbody . $origbody; - - $cnt = 0; - foreach($images as $image) { - // We're depending on the property of 'foreach' (specified on the PHP website) that - // it loops over the array starting from the first element and going sequentially - // to the last element - $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); - $cnt++; - } - - return $newbody; -}} - - - function message_content(&$a) { $o = ''; @@ -201,126 +32,15 @@ function message_content(&$a) { '$tab_content' => $tab_content )); - if((argc() == 3) && (argv(1) === 'drop' || argv(1) === 'dropconv')) { + if((argc() == 3) && (argv(1) === 'dropconv')) { if(! intval(argv(2))) return; $cmd = argv(1); - if($cmd === 'drop') { - $r = private_messages_drop(local_user(), argv(2)); - if($r) { - info( t('Message deleted.') . EOL ); - } - goaway($a->get_baseurl(true) . '/message' ); - } - else { - $r = private_messages_drop(local_user(), argv(2), true); - if($r) - info( t('Conversation removed.') . EOL ); - goaway($a->get_baseurl(true) . '/message' ); - } - } - - if((argc() == 3) && (argv(1) === 'recall')) { - if(! intval(argv(2))) - return; - $cmd = argv(1); - $r = q("update mail set mail_flags = mail_flags | %d where id = %d and channel_id = %d limit 1", - intval(MAIL_RECALLED), - intval(argv(2)), - intval(local_user()) - ); - proc_run('php','include/notifier.php','mail',intval(argv(2))); - - if($r) { - info( t('Message recalled.') . EOL ); - } + $r = private_messages_drop(local_user(), argv(2), true); + if($r) + info( t('Conversation removed.') . EOL ); goaway($a->get_baseurl(true) . '/message' ); - } - - - if((argc() > 1) && ($a->argv[1] === 'new')) { - - $o .= $header; - - $plaintext = false; - if(intval(get_pconfig(local_user(),'system','plaintext'))) - $plaintext = true; - if(! feature_enabled(local_user(),'richtext')) - $plaintext = true; - - $tpl = get_markup_template('msg-header.tpl'); - - $a->page['htmlhead'] .= replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(true), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$nickname' => $channel['channel_address'], - '$linkurl' => t('Please enter a link URL:'), - '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') - )); - - $preselect = (isset($a->argv[2])?array($a->argv[2]):false); - - - $prename = $preurl = $preid = ''; - - if($preselect) { - $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash - where abook_channel = %d and abook_id = %d limit 1", - intval(local_user()), - intval(argv(2)) - ); - if($r) { - $prename = $r[0]['xchan_name']; - $preurl = $r[0]['xchan_url']; - $preid = $r[0]['abook_id']; - } - } - - $prefill = (($preselect) ? $prename : ''); - - if(! $prefill) { - if(array_key_exists('to',$_REQUEST)) - $prefill = $_REQUEST['to']; - } - - // the ugly select box - - $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); - - $tpl = get_markup_template('prv_message.tpl'); - $o .= replace_macros($tpl,array( - '$header' => t('Send Private Message'), - '$to' => t('To:'), - '$showinputs' => 'true', - '$prefill' => $prefill, - '$autocomp' => $autocomp, - '$preid' => $preid, - '$subject' => t('Subject:'), - '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), - '$text' => ((x($_REQUEST,'body')) ? htmlspecialchars($_REQUEST['body'], ENT_COMPAT, 'UTF-8') : ''), - '$readonly' => '', - '$yourmessage' => t('Your message:'), - '$select' => $select, - '$parent' => '', - '$upload' => t('Upload photo'), - '$attach' => t('Attach file'), - '$insert' => t('Insert web link'), - '$wait' => t('Please wait'), - '$submit' => t('Submit'), - '$defexpire' => '', - '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'), - '$expires' => t('Set expiration date'), - '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? 'block' : 'none'), - '$encrypt' => t('Encrypt text'), - '$cipher' => $cipher, - - - )); - - return $o; - } - if(argc() == 1) { // list messages @@ -359,115 +79,5 @@ function message_content(&$a) { return $o; } - if((argc() > 1) && (intval(argv(1)))) { - - $o .= $header; - - $plaintext = true; - if( local_user() && feature_enabled(local_user(),'richtext') ) - $plaintext = false; - - $messages = private_messages_fetch_conversation(local_user(), argv(1), true); - - if(! $messages) { - info( t('Message not found.') . EOL); - return $o; - } - - if($messages[0]['to_xchan'] === $channel['channel_hash']) - $a->poi = $messages[0]['from']; - else - $a->poi = $messages[0]['to']; - - require_once('include/Contact.php'); - - $a->set_widget('mail_conversant',vcard_from_xchan($a->poi,$get_observer_hash,'mail')); - - - $tpl = get_markup_template('msg-header.tpl'); - - $a->page['htmlhead'] .= replace_macros($tpl, array( - '$nickname' => $channel['channel_addr'], - '$baseurl' => $a->get_baseurl(true), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$linkurl' => t('Please enter a link URL:'), - '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') - )); - - - $mails = array(); - $seen = 0; - $unknown = false; - - foreach($messages as $message) { - - $s = theme_attachments($message); - - $mails[] = array( - 'id' => $message['id'], - 'from_name' => $message['from']['xchan_name'], - 'from_url' => chanlink_hash($message['from_xchan']), - 'from_photo' => $message['from']['xchan_photo_m'], - 'to_name' => $message['to']['xchan_name'], - 'to_url' => chanlink_hash($message['to_xchan']), - 'to_photo' => $message['to']['xchan_photo_m'], - 'subject' => $message['title'], - 'body' => smilies(bbcode($message['body']) . $s), - 'delete' => t('Delete message'), - 'recall' => t('Recall message'), - 'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false), - 'is_recalled' => (($message['mail_flags'] & MAIL_RECALLED) ? t('Message has been recalled.') : ''), - 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'), - ); - - $seen = $message['seen']; - - } - - $recp = (($message['from_xchan'] === $channel['channel_hash']) ? 'to' : 'from'); - -// FIXME - move this HTML to template - - $select = $message[$recp]['xchan_name'] . ''; - $parent = ''; - - $tpl = get_markup_template('mail_display.tpl'); - $o = replace_macros($tpl, array( - '$prvmsg_header' => t('Private Conversation'), - '$thread_id' => $a->argv[1], - '$thread_subject' => $message['title'], - '$thread_seen' => $seen, - '$delete' => t('Delete conversation'), - '$canreply' => (($unknown) ? false : '1'), - '$unknown_text' => t("No secure communications available. You may be able to respond from the sender's profile page."), - '$mails' => $mails, - - // reply - '$header' => t('Send Reply'), - '$to' => t('To:'), - '$showinputs' => '', - '$subject' => t('Subject:'), - '$subjtxt' => $message['title'], - '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', - '$yourmessage' => t('Your message:'), - '$text' => '', - '$select' => $select, - '$parent' => $parent, - '$upload' => t('Upload photo'), - '$attach' => t('Attach file'), - '$insert' => t('Insert web link'), - '$submit' => t('Submit'), - '$wait' => t('Please wait'), - '$defexpire' => '', - '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'), - '$expires' => t('Set expiration date'), - '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? 'block' : 'none'), - '$encrypt' => t('Encrypt text'), - '$cipher' => $cipher, - - )); - - return $o; - } } diff --git a/mod/ping.php b/mod/ping.php index 414f06e53..a0938cb15 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -151,7 +151,7 @@ function ping_init(&$a) { foreach($t as $zz) { // $msg = sprintf( t('sent you a private message.'), $zz['xchan_name']); $notifs[] = array( - 'notify_link' => $a->get_baseurl() . '/message/' . $zz['id'], + 'notify_link' => $a->get_baseurl() . '/mail/' . $zz['id'], 'name' => $zz['xchan_name'], 'url' => $zz['xchan_url'], 'photo' => $zz['xchan_photo_s'], diff --git a/version.inc b/version.inc index 81076cbc3..72c1cfa54 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-20.532 +2013-12-21.533 diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css new file mode 100644 index 000000000..c278f4d53 --- /dev/null +++ b/view/css/mod_mail.css @@ -0,0 +1,100 @@ +/* message */ + +#mail-list-wrapper { + border-top: 1px solid #ccc; + padding: 5px 5px 5px 5px; +} + +span.mail-list { + float: left; + width: 20%; +} + +img.mail-list-sender-photo { + height: 24px; + width: 24px; + float: left; + margin-right: 30px; +} + +.mail-list-remove { + width: 5% !important; +} + +/* message/new */ + +#prvmail-to-label, +#prvmail-subject-label, +#prvmail-expires-label, +#prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: left; + margin-top: 10px; + margin-right: 30px; +} + +#prvmail-upload-wrapper, +#prvmail-attach-wrapper, +#prvmail-link-wrapper, +#prvmail-expire-wrapper, +#prvmail-encrypt-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; + cursor: pointer; +} + +#prvmail-end { + clear: both; +} + +/* message/id */ + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} + +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-conv-delete-icon { + border: none; +} + +.mail-conv-recall-wrapper { + float: right; + margin-right: 10px; + margin-top: 15px; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-break { + clear: both; +} diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js new file mode 100644 index 000000000..82f60f46f --- /dev/null +++ b/view/js/mod_mail.js @@ -0,0 +1,13 @@ +$(document).ready(function() { + var a; + a = $("#recip").autocomplete({ + serviceUrl: baseurl + '/acl', + minChars: 2, + width: 250, + id: 'recip-ac', + onSelect: function(value,data) { + $("#recip-complete").val(data); + }, + }); + +}); diff --git a/view/pdl/mod_mail.pdl b/view/pdl/mod_mail.pdl new file mode 100644 index 000000000..d8f50ad7a --- /dev/null +++ b/view/pdl/mod_mail.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=vcard][/widget] +[/region] diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 84bdb451a..f794ffc78 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -8,9 +8,9 @@
      {{$mail.date}}
      {{$mail.subject}}
      {{$mail.body}}
      -
      +
      {{if $mail.can_recall}} -
      +
      {{/if}}
      diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index c96827996..e17a206a0 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,7 +1,7 @@
      {{$from_name}} {{$from_name}} - {{$subject}} + {{$subject}} {{$date}}
       
      diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index b7654dc2d..3330a338f 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -1,7 +1,7 @@

      {{$header}}

      -
      + {{$parent}} From 0366991b45a9b54da66850bce44b4b9dc1d939a7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 02:04:55 -0800 Subject: [PATCH 23/24] appears that I missed a few files for Comanchification. so here's mitem. --- include/widgets.php | 9 ++++++++- mod/mitem.php | 5 +---- version.inc | 2 +- view/pdl/mod_mitem.pdl | 4 ++++ 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 view/pdl/mod_mitem.pdl diff --git a/include/widgets.php b/include/widgets.php index d6ef9ec07..a1ff756ff 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -567,4 +567,11 @@ function widget_dirsort($arr) { function widget_dirtags($arr) { return dir_tagblock(z_root() . '/directory',null); -} \ No newline at end of file +} + +function widget_menu_preview($arr) { + if(! get_app()->data['menu_item']) + return; + require_once('include/menu.php'); + return menu_render(get_app()->data['menu_item']); +} diff --git a/mod/mitem.php b/mod/mitem.php index 8e60e2d65..e0aa1b87a 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -81,11 +81,8 @@ function mitem_content(&$a) { $channel = $a->get_channel(); - $a->set_widget('design',design_tools()); - - $m = menu_fetch($a->data['menu']['menu_name'],local_user(), get_observer_hash()); - $a->set_widget('menu_preview',menu_render($m)); + $a->data['menu_item'] = $m; if(argc() == 2) { diff --git a/version.inc b/version.inc index 72c1cfa54..4aa1ec592 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-21.533 +2013-12-22.534 diff --git a/view/pdl/mod_mitem.pdl b/view/pdl/mod_mitem.pdl new file mode 100644 index 000000000..c210606d0 --- /dev/null +++ b/view/pdl/mod_mitem.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=design_tools][/widget] +[widget=menu_preview][/widget] +[/region] \ No newline at end of file From 7e7b5bfa4930493a8feae10b0550e29797956c70 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 02:16:45 -0800 Subject: [PATCH 24/24] last remaining files to be Comanchified with the exception of mod_admin. Though I should probably take a third look to see if anything else uses widgets. In fact - it appears that the flattrwidget does. --- mod/chanview.php | 4 ---- mod/connect.php | 4 ---- view/pdl/mod_chanview.pdl | 3 +++ view/pdl/mod_connect.pdl | 3 +++ 4 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 view/pdl/mod_chanview.pdl create mode 100644 view/pdl/mod_connect.pdl diff --git a/mod/chanview.php b/mod/chanview.php index c87b85d26..55f7e95d6 100644 --- a/mod/chanview.php +++ b/mod/chanview.php @@ -88,10 +88,6 @@ function chanview_content(&$a) { if(local_user() && get_pconfig(local_user(),'system','chanview_full')) goaway($url); - - if($a->poi['xchan_hash']) - $a->set_widget('vcard',vcard_from_xchan($a->poi,$observer,'chanview')); - $o = replace_macros(get_markup_template('chanview.tpl'),array( '$url' => $url, '$full' => t('toggle full screen mode') diff --git a/mod/connect.php b/mod/connect.php index 93f994af5..f7748bcaf 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -23,10 +23,6 @@ function connect_init(&$a) { $a->data['channel'] = $r[0]; profile_load($a,$which,''); - - profile_create_sidebar($a,false); - - } function connect_post(&$a) { diff --git a/view/pdl/mod_chanview.pdl b/view/pdl/mod_chanview.pdl new file mode 100644 index 000000000..d8f50ad7a --- /dev/null +++ b/view/pdl/mod_chanview.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=vcard][/widget] +[/region] diff --git a/view/pdl/mod_connect.pdl b/view/pdl/mod_connect.pdl new file mode 100644 index 000000000..6b1d2a15e --- /dev/null +++ b/view/pdl/mod_connect.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=profile][/widget] +[/region]